FIX: Prevent JS/CSS caching issues during updates of NagVis

NagVis · May 30, 2016 · d07f3b4 · d07f3b4
1 parent 00686a6
commit d07f3b4
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 48 deletions.
diff --git a/.f12 b/.f12
@@ -8,7 +8,10 @@
 
     BASEDIR=/opt/local/nagvis
     $SUDO rsync -av etc $BASEDIR/
-    $SUDO sed "s|@NAGVIS_WEB@|/nagvis|g;s|@NAGVIS_PATH@|/opt/local/nagvis/share|g" $BASEDIR/etc/apache2-nagvis.conf-sample > $BASEDIR/etc/apache.conf
+    $SUDO cp $BASEDIR/etc/apache2-nagvis.conf-sample $BASEDIR/etc/apache.conf
+    $SUDO gsed -i -e 's|@NAGVIS_WEB@|/nagvis|g' \
+                 -e 's|@NAGVIS_PATH@|/opt/local/nagvis/share|g' $BASEDIR/etc/apache.conf
+    $SUDO apachectl restart
     if [ ! -f $BASEDIR/etc/nagvis.ini.php ]; then
         $SUDO cp $BASEDIR/etc/nagvis.ini.php{-sample,}
     fi

diff --git a/ChangeLog b/ChangeLog
@@ -4,6 +4,7 @@ Core:
     objects that are not aggregations.
 
 Frontend:
+  * FIX: Prevent JS/CSS caching issues during updates of NagVis
   * FIX: Improved error handling in case of modifying objects which
     backends report issues
   * FIX: Improved error handling in case of missing backend configured

diff --git a/share/frontend/nagvis-js/classes/NagVisHeaderMenu.php b/share/frontend/nagvis-js/classes/NagVisHeaderMenu.php
@@ -358,7 +358,7 @@ private function getStaticMacros() {
             'currentUri'         => preg_replace('/[&?]lang=[a-z]{2}_[A-Z]{2}/', '', $UHANDLER->getRequestUri()),
             'pathImages'         => cfg('paths', 'htmlimages'),
             'showStates'         => cfg('defaults', 'header_show_states'),
-            'pathHeaderJs'       => path('html', 'global', 'templates', $this->templateName.'.header.js'),
+            'pathHeaderJs'       => path('html', 'global', 'templates', $this->templateName.'.header.js?v='.CONST_VERSION),
             'pathTemplates'      => path('html', 'global', 'templates'),
             'pathTemplateImages' => path('html', 'global', 'templateimages'),
             'langSearch'         => l('Search'),

diff --git a/share/frontend/nagvis-js/classes/NagVisIndexView.php b/share/frontend/nagvis-js/classes/NagVisIndexView.php
@@ -67,6 +67,7 @@ public function parse() {
             'htmlBase'         => cfg('paths', 'htmlbase'),
             'htmlJs'           => cfg('paths', 'htmljs'),
             'htmlCss'          => cfg('paths', 'htmlcss'),
+            'version'          => CONST_VERSION,
             'htmlTemplates'    => path('html', 'global', 'templates'),
             'bUseCompressedJs' => $this->checkJsCompressed(),
             'customStylesheet' => $this->sCustomStylesheet,

diff --git a/share/userfiles/templates/default.index.html b/share/userfiles/templates/default.index.html
@@ -9,54 +9,54 @@
     <meta name="viewport" content="width=480, initial-scale=0.6666, maximum-scale=1.0, minimum-scale=0.6666" />
 
     {if $bUseCompressedJs}
-    <script type="text/javascript" src="{$htmlJs}NagVisCompressed.js"></script>
+    <script type="text/javascript" src="{$htmlJs}NagVisCompressed.js?v={$version}"></script>
     {else}
-    <script type="text/javascript" src="{$htmlJs}ExtStacktrace.js"></script>
-    <script type="text/javascript" src="{$htmlJs}ExtLeaflet.js"></script>
-    <script type="text/javascript" src="{$htmlJs}nagvis.js"></script>
-    <script type="text/javascript" src="{$htmlJs}edit.js"></script>
-    <script type="text/javascript" src="{$htmlJs}popupWindow.js"></script>
-    <script type="text/javascript" src="{$htmlJs}ExtBase.js"></script>
-    <script type="text/javascript" src="{$htmlJs}frontendMessage.js"></script>
-    <script type="text/javascript" src="{$htmlJs}frontendEventlog.js"></script>
-    <script type="text/javascript" src="{$htmlJs}ajax.js"></script>
-    <script type="text/javascript" src="{$htmlJs}ajaxActions.js"></script>
-    <script type="text/javascript" src="{$htmlJs}dynfavicon.js"></script>
-    <script type="text/javascript" src="{$htmlJs}Element.js"></script>
-    <script type="text/javascript" src="{$htmlJs}ElementContext.js"></script>
-    <script type="text/javascript" src="{$htmlJs}ElementHover.js"></script>
-    <script type="text/javascript" src="{$htmlJs}ElementIcon.js"></script>
-    <script type="text/javascript" src="{$htmlJs}ElementLine.js"></script>
-    <script type="text/javascript" src="{$htmlJs}ElementGadget.js"></script>
-    <script type="text/javascript" src="{$htmlJs}ElementLabel.js"></script>
-    <script type="text/javascript" src="{$htmlJs}ElementShape.js"></script>
-    <script type="text/javascript" src="{$htmlJs}ElementBox.js"></script>
-    <script type="text/javascript" src="{$htmlJs}ElementTile.js"></script>
-    <script type="text/javascript" src="{$htmlJs}View.js"></script>
-    <script type="text/javascript" src="{$htmlJs}ViewMap.js"></script>
-    <script type="text/javascript" src="{$htmlJs}ViewWorldmap.js"></script>
-    <script type="text/javascript" src="{$htmlJs}ViewOverview.js"></script>
-    <script type="text/javascript" src="{$htmlJs}ViewUrl.js"></script>
-    <script type="text/javascript" src="{$htmlJs}NagVisObject.js"></script>
-    <script type="text/javascript" src="{$htmlJs}NagVisStatefulObject.js"></script>
-    <script type="text/javascript" src="{$htmlJs}NagVisStatelessObject.js"></script>
-    <script type="text/javascript" src="{$htmlJs}NagVisHost.js"></script>
-    <script type="text/javascript" src="{$htmlJs}NagVisService.js"></script>
-    <script type="text/javascript" src="{$htmlJs}NagVisHostgroup.js"></script>
-    <script type="text/javascript" src="{$htmlJs}NagVisServicegroup.js"></script>
-    <script type="text/javascript" src="{$htmlJs}NagVisDynGroup.js"></script>
-    <script type="text/javascript" src="{$htmlJs}NagVisAggr.js"></script>
-    <script type="text/javascript" src="{$htmlJs}NagVisMap.js"></script>
-    <script type="text/javascript" src="{$htmlJs}NagVisShape.js"></script>
-    <script type="text/javascript" src="{$htmlJs}NagVisLine.js"></script>
-    <script type="text/javascript" src="{$htmlJs}NagVisTextbox.js"></script>
-    <script type="text/javascript" src="{$htmlJs}NagVisContainer.js"></script>
-    <script type="text/javascript" src="{$htmlJs}NagVisRotation.js"></script>
-    <script type="text/javascript" src="{$htmlJs}frontend.js"></script>
-    <script type="text/javascript" src="{$htmlJs}ExtWzJsGraphics.js"></script>
-    <script type="text/javascript" src="{$htmlJs}ExtJSColor.js"></script>
+    <script type="text/javascript" src="{$htmlJs}ExtStacktrace.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}ExtLeaflet.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}nagvis.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}edit.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}popupWindow.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}ExtBase.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}frontendMessage.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}frontendEventlog.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}ajax.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}ajaxActions.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}dynfavicon.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}Element.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}ElementContext.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}ElementHover.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}ElementIcon.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}ElementLine.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}ElementGadget.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}ElementLabel.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}ElementShape.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}ElementBox.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}ElementTile.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}View.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}ViewMap.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}ViewWorldmap.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}ViewOverview.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}ViewUrl.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}NagVisObject.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}NagVisStatefulObject.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}NagVisStatelessObject.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}NagVisHost.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}NagVisService.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}NagVisHostgroup.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}NagVisServicegroup.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}NagVisDynGroup.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}NagVisAggr.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}NagVisMap.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}NagVisShape.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}NagVisLine.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}NagVisTextbox.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}NagVisContainer.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}NagVisRotation.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}frontend.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}ExtWzJsGraphics.js?v={$version}"></script>
+    <script type="text/javascript" src="{$htmlJs}ExtJSColor.js?v={$version}"></script>
     {/if}
-    <link rel="stylesheet" type="text/css" href="{$htmlTemplates}default.css" />
+    <link rel="stylesheet" type="text/css" href="{$htmlTemplates}default.css?v={$version}" />
     {if $customStylesheet != ""}
     <link rel="stylesheet" type="text/css" href="{$customStylesheet}" />
     {/if}