Dev: force republish admin assets after update

LimeSurvey · May 9, 2016 · e0026be · e0026be
1 parent 456470c
commit e0026be
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/application/config/version.php b/application/config/version.php
@@ -16,7 +16,7 @@
 $config['dbversionnumber'] = 258;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
-$config['assetsversionnumber'] = 6;
+$config['assetsversionnumber'] = 7;
 return $config;
 
 ?>
diff --git a/application/models/AdminTheme.php b/application/models/AdminTheme.php
@@ -196,6 +196,24 @@ public static function getInstance()
         return self::$instance;
     }
 
+    /**
+     * Touch each directory in standard template directory to force assset manager to republish them
+     */
+    public static function forceAssets()
+    {
+        // Don't touch symlinked assets because it won't work
+        if (App()->getAssetManager()->linkAssets) return;
+        $standardTemplatesPath = Yii::app()->getConfig("styledir");
+        $Resource = opendir($standardTemplatesPath);
+        while ($Item = readdir($Resource))
+        {
+            if (is_dir($standardTemplatesPath . $Item) && $Item != "." && $Item != "..")
+            {
+                touch($standardTemplatesPath . $Item);
+            }
+        }
+    }
+
     /**
      * Register all the styles and scripts of the current template
      * Check if RTL is needed, use asset manager if needed

diff --git a/application/models/UpdateForm.php b/application/models/UpdateForm.php
@@ -372,6 +372,7 @@ public function republishAssets()
     {
         // Republish the template assets
         Template::model()->forceAssets();
+        AdminTheme::model()->forceAssets();
     }
 
     /**