diff --git a/src/main/scala/app/SystemSettingsController.scala b/src/main/scala/app/SystemSettingsController.scala index 0cef067..076da08 100644 --- a/src/main/scala/app/SystemSettingsController.scala +++ b/src/main/scala/app/SystemSettingsController.scala @@ -142,6 +142,7 @@ SystemSettingsControllerBase.AvailablePlugin( repo.id, properties.getProperty("id"), + properties.getProperty("version"), properties.getProperty("author"), properties.getProperty("url"), properties.getProperty("description")) @@ -153,5 +154,6 @@ } object SystemSettingsControllerBase { - case class AvailablePlugin(repository: String, id: String, author: String, url: String, description: String) + case class AvailablePlugin( + repository: String, id: String, version: String, author: String, url: String, description: String) } diff --git a/src/main/scala/plugin/JavaScriptPlugin.scala b/src/main/scala/plugin/JavaScriptPlugin.scala index 739e035..1a8d0e5 100644 --- a/src/main/scala/plugin/JavaScriptPlugin.scala +++ b/src/main/scala/plugin/JavaScriptPlugin.scala @@ -5,7 +5,8 @@ import scala.collection.mutable.ListBuffer import plugin.PluginSystem.{Action, GlobalMenu, RepositoryMenu} -class JavaScriptPlugin(val id: String, val author: String, val url: String, val description: String) extends Plugin { +class JavaScriptPlugin(val id: String, val version: String, + val author: String, val url: String, val description: String) extends Plugin { private val repositoryMenuList = ListBuffer[RepositoryMenu]() private val globalMenuList = ListBuffer[GlobalMenu]() @@ -65,7 +66,8 @@ object JavaScriptPlugin { - def define(id: String, author: String, url: String, description: String) = new JavaScriptPlugin(id, author, url, description) + def define(id: String, version: String, author: String, url: String, description: String) + = new JavaScriptPlugin(id, version, author, url, description) def evaluateJavaScript(script: String, vars: Map[String, Any] = Map.empty): Any = { val context = JsContext.enter() diff --git a/src/main/scala/plugin/Plugin.scala b/src/main/scala/plugin/Plugin.scala index 66f475e..59961fe 100644 --- a/src/main/scala/plugin/Plugin.scala +++ b/src/main/scala/plugin/Plugin.scala @@ -4,6 +4,7 @@ trait Plugin { val id: String + val version: String val author: String val url: String val description: String diff --git a/src/main/scala/plugin/PluginSystem.scala b/src/main/scala/plugin/PluginSystem.scala index e2477c1..539c992 100644 --- a/src/main/scala/plugin/PluginSystem.scala +++ b/src/main/scala/plugin/PluginSystem.scala @@ -62,6 +62,7 @@ try { JavaScriptPlugin.evaluateJavaScript(script, Map( "id" -> properties.getProperty("id"), + "version" -> properties.getProperty("version"), "author" -> properties.getProperty("author"), "url" -> properties.getProperty("url"), "description" -> properties.getProperty("description") diff --git a/src/main/scala/plugin/ScalaPlugin.scala b/src/main/scala/plugin/ScalaPlugin.scala index b1388e1..c0bb728 100644 --- a/src/main/scala/plugin/ScalaPlugin.scala +++ b/src/main/scala/plugin/ScalaPlugin.scala @@ -6,7 +6,8 @@ import javax.servlet.http.{HttpServletResponse, HttpServletRequest} // TODO This is a sample implementation for Scala based plug-ins. -class ScalaPlugin(val id: String, val author: String, val url: String, val description: String) extends Plugin { +class ScalaPlugin(val id: String, val version: String, + val author: String, val url: String, val description: String) extends Plugin { private val repositoryMenuList = ListBuffer[RepositoryMenu]() private val globalMenuList = ListBuffer[GlobalMenu]() diff --git a/src/main/twirl/admin/plugins/available.scala.html b/src/main/twirl/admin/plugins/available.scala.html index 0c5cf9a..ee5eeff 100644 --- a/src/main/twirl/admin/plugins/available.scala.html +++ b/src/main/twirl/admin/plugins/available.scala.html @@ -8,6 +8,7 @@ + @@ -17,6 +18,7 @@ @plugin.id + diff --git a/src/main/twirl/admin/plugins/installed.scala.html b/src/main/twirl/admin/plugins/installed.scala.html index 7a0fa6b..2c86c0d 100644 --- a/src/main/twirl/admin/plugins/installed.scala.html +++ b/src/main/twirl/admin/plugins/installed.scala.html @@ -8,6 +8,7 @@
IDVersion Provider Description
@plugin.version @plugin.author @plugin.description
+ @@ -17,6 +18,7 @@ @plugin.id +
IDVersion Provider Description
@plugin.version @plugin.author @plugin.description