Merge branch 'hotfix/2019.1.2'

openequella · Nov 22, 2019 · ecbf6db · ecbf6db
2 parents afcf953 + 7ddc924
commit ecbf6db
Show file tree

Hide file tree

Showing 53 changed files with 4,234 additions and 2,474 deletions.
diff --git a/Dev/learningedge-config/build.sbt b/Dev/learningedge-config/build.sbt
@@ -21,9 +21,10 @@ prepareDevConfig := {
 
   IO.copy(fromInstaller ++ fromDefaults, CopyOptions().withOverwrite(false))
 
-  val port     = bc.getInt("port")
-  val hostname = bc.getString("hostname")
-  val imPath   = bc.getString("imagemagick")
+  val port       = bc.getInt("port")
+  val hostname   = bc.getString("hostname")
+  val imPath     = bc.getString("imagemagick")
+  var auditLevel = if (bc.hasPath("audit.level")) bc.getString("audit.level") else "NONE"
   val adminurl =
     if (bc.hasPath("adminurl")) bc.getString("adminurl") else s"http://$hostname:$port/"
   val mc = new PropertiesConfiguration()
@@ -44,6 +45,12 @@ prepareDevConfig := {
   imc.setProperty("imageMagick.path", imPath)
   imc.save(baseDir / "plugins/com.tle.core.imagemagick/config.properties")
 
+  val viewItemConfiguration = new PropertiesConfiguration()
+  viewItemConfiguration.load(
+    installerConfig / "plugins/com.tle.web.viewitem/mandatory.properties.unresolved")
+  viewItemConfiguration.setProperty("audit.level", auditLevel)
+  viewItemConfiguration.save(baseDir / "plugins/com.tle.web.viewitem/mandatory.properties")
+
   val log = streams.value.log
   log.info(s"Dev configuration with admin url of '$adminurl'")
   log.info(s"ImageMagick binary dir set to '$imPath'")

diff --git a/...com.tle.web.viewitem/mandatory.properties → ....viewitem/mandatory.properties.unresolved b/...com.tle.web.viewitem/mandatory.properties → ....viewitem/mandatory.properties.unresolved
@@ -11,4 +11,4 @@
 #      Logs the viewing of an item or it's attachments only once per user session.
 #      This setting will increase the amount of memory required for each user session.
 #
-audit.level = NONE
+audit.level = ${auditing/audit.level}