Merge branch 'fix_cache_bust' into dev

lib/galaxy/webapps/galaxy/buildapp.py

@@ -2,10 +2,11 @@
 Provides factory methods to assemble the Galaxy web application
 """
 
-import sys
+import atexit
+import time
 import os
 import os.path
-import atexit
+import sys
 
 from paste import httpexceptions
 import pkg_resources
@@ -114,6 +115,8 @@ def app_factory( global_conf, **kwargs ):
     except:
         pass
 
+    app.server_starttime = int(time.time())  # used for cachebusting
+
     if not app.config.is_uwsgi:
         postfork_setup()
 

templates/base.mako

@@ -79,7 +79,8 @@
             shim: {
                 "libs/underscore": { exports: "_" },
                 "libs/backbone/backbone": { exports: "Backbone" }
-            }
+            },
+            urlArgs: 'v=${int(app.server_starttime)}'
         });
     </script>
 

templates/base/base_panels.mako

@@ -89,7 +89,8 @@
             shim: {
                 "libs/underscore": { exports: "_" },
                 "libs/backbone/backbone": { exports: "Backbone" }
-            }
+            },
+            urlArgs: 'v=${int(app.server_starttime)}'
         });
     </script>
 

templates/webapps/galaxy/dataset/display.mako

@@ -13,7 +13,8 @@
             baseUrl: "${h.url_for('/static/scripts')}",
             shim: {
                 "libs/backbone/backbone": { exports: "Backbone" },
-            }
+            },
+            urlArgs: 'v=${int(app.server_starttime)}'
         });
 
         require(['mvc/data'], function(data) {

templates/webapps/galaxy/dataset/tabular_chunked.mako

@@ -12,7 +12,8 @@
             baseUrl: "${h.url_for('/static/scripts')}",
             shim: {
                 "libs/backbone/backbone": { exports: "Backbone" },
-            }
+            },
+            urlArgs: 'v=${int(app.server_starttime)}'
         });
 
         require([ 'mvc/data' ], function( data ) {

templates/webapps/galaxy/galaxy.panels.mako

@@ -97,7 +97,8 @@
                 "libs/underscore": { exports: "_" },
                 "libs/d3": { exports: "d3" },
                 "libs/backbone/backbone": { exports: "Backbone" },
-            }
+            },
+            urlArgs: 'v=${int(app.server_starttime)}'
         });
         var galaxy_config = ${ h.dumps( self.galaxy_config ) };
         

templates/webapps/galaxy/history/display.mako

@@ -49,7 +49,8 @@
         hdaJSON      = ${h.dumps( hda_dicts )};
 
     require.config({
-        baseUrl : "${h.url_for( '/static/scripts' )}"
+        baseUrl : "${h.url_for( '/static/scripts' )}",
+        urlArgs: 'v=${int(app.server_starttime)}'
     })([ 'mvc/history/history-panel-annotated' ], function( panelMod ){
         // history module is already in the dpn chain from the panel. We can re-scope it here.
         var historyModel = require( 'mvc/history/history-model' ),

templates/webapps/galaxy/history/embed.mako

@@ -48,7 +48,8 @@
         $embeddedHistory = $( thisScript ).prev();
 
     require.config({
-        baseUrl : "${h.url_for( '/static/scripts' )}"
+        baseUrl : "${h.url_for( '/static/scripts' )}",
+        urlArgs: 'v=${int(app.server_starttime)}'
     });
     require([ 'mvc/history/history-panel-annotated' ], function( panelMod ){
 

templates/webapps/galaxy/history/view.mako

@@ -177,7 +177,8 @@ a.btn {
         baseUrl : "${h.url_for( '/static/scripts' )}",
         paths   : {
             'jquery' : 'libs/jquery/jquery'
-        }
+        },
+        urlArgs: 'v=${int(app.server_starttime)}'
     })([
         'mvc/user/user-model',
         panelToUse.location,

templates/webapps/galaxy/root/tool_menu.mako

@@ -9,7 +9,8 @@
                 baseUrl: "${h.url_for('/static/scripts')}",
                 shim: {
                     "libs/underscore": { exports: "_" }
-                }
+                },
+                urlArgs: 'v=${int(app.server_starttime)}'
         });
 
         require(["mvc/tools"], function(tools_mod) {

templates/webapps/galaxy/visualization/display.mako

@@ -58,7 +58,8 @@
             shim: {
                 "libs/underscore": { exports: "_" },
                 "libs/backbone/backbone": { exports: "Backbone" },
-            }
+            },
+            urlArgs: 'v=${int(app.server_starttime)}'
         });
         require( ["viz/trackster"], function(trackster) {
 

templates/webapps/galaxy/visualization/phyloviz.mako

@@ -147,7 +147,8 @@
             shim: {
                 "libs/underscore": { exports: "_" },
                 "libs/d3": { exports: "d3" }
-            }
+            },
+            urlArgs: 'v=${int(app.server_starttime)}'
         });
 
         require(["viz/phyloviz"], function(phyloviz_mod) {

templates/webapps/galaxy/visualization/sweepster.mako

@@ -116,7 +116,8 @@
                     "libs/underscore": { exports: "_" },
                     "libs/d3": { exports: "d3" },
                     "libs/backbone/backbone": { exports: "Backbone" },
-                }
+                },
+                urlArgs: 'v=${int(app.server_starttime)}'
         });
 
         require(["libs/d3", "viz/sweepster"], function(d3, sweepster) {