Merge lp:~blake-rouse/maas/fix-1581318-1.9 into lp:maas/1.9

[Blake Rouse]

Append version to templateUrl in maas.js angular code.

[Blake Rouse (blake-rouse)]

Self-approving for backport.

review: Approve

=== modified file 'src/maasserver/static/js/angular/maas.js'
--- src/maasserver/static/js/angular/maas.js	2015-09-30 05:38:27 +0000
+++ src/maasserver/static/js/angular/maas.js	2016-05-25 15:55:48 +0000
@@ -13,6 +13,12 @@
         $interpolateProvider.startSymbol('{$');
         $interpolateProvider.endSymbol('$}');
 
+        // Helper that wrappers the templateUrl to append the files version
+        // to the path. Used to override client cache.
+        function versionedPath(path) {
+            return path + "?v=" + MAAS_config.files_version;
+        }
+
         // Setup routes only for the index page, all remaining pages should
         // not use routes. Once all pages are converted to using Angular this
         // will go away. Causing the page to never have to reload.
@@ -24,27 +30,33 @@
         if(path === href) {
             $routeProvider.
                 when('/nodes', {
-                    templateUrl: 'static/partials/nodes-list.html',
+                    templateUrl: versionedPath(
+                        'static/partials/nodes-list.html'),
                     controller: 'NodesListController'
                 }).
                 when('/node/:system_id', {
-                    templateUrl: 'static/partials/node-details.html',
+                    templateUrl: versionedPath(
+                        'static/partials/node-details.html'),
                     controller: 'NodeDetailsController'
                 }).
                 when('/node/:system_id/result/:filename', {
-                    templateUrl: 'static/partials/node-result.html',
+                    templateUrl: versionedPath(
+                        'static/partials/node-result.html'),
                     controller: 'NodeResultController'
                 }).
                 when('/node/:system_id/events', {
-                    templateUrl: 'static/partials/node-events.html',
+                    templateUrl: versionedPath(
+                        'static/partials/node-events.html'),
                     controller: 'NodeEventsController'
                 }).
                 when('/subnets', {
-                    templateUrl: 'static/partials/subnets-list.html',
+                    templateUrl: versionedPath(
+                        'static/partials/subnets-list.html'),
                     controller: 'SubnetsListController'
                 }).
                 when('/subnet/:subnet_id', {
-                    templateUrl: 'static/partials/subnet-details.html',
+                    templateUrl: versionedPath(
+                        'static/partials/subnet-details.html'),
                     controller: 'SubnetDetailsController'
                 }).
                 otherwise({

=== modified file 'src/maasserver/templates/maasserver/js-conf.html'
--- src/maasserver/templates/maasserver/js-conf.html	2015-11-12 16:13:05 +0000
+++ src/maasserver/templates/maasserver/js-conf.html	2016-05-25 15:55:48 +0000
@@ -1,16 +1,3 @@
-<script type="text/javascript"
-    src="{% url "merge" filename="jquery.js" %}?v={{files_version}}">
-</script>
-<script type="text/javascript"
-    src="{% url "merge" filename="angular.js" %}?v={{files_version}}">
-</script>
-<script type="text/javascript"
-    src="{% url "merge" filename="ng-tags-input.js" %}?v={{files_version}}">
-</script>
-<script type="text/javascript"
-    src="{% url "merge" filename="maas-angular.js" %}?v={{files_version}}">
-</script>
-
 <script type="text/javascript">
 <!--
 var YUI_config = {
@@ -30,10 +17,25 @@
         account_handler: '{% url "account_handler" %}',
         images_handler: '{% url "images" %}'
         },
+    files_version: '{{files_version}}',
     debug: {% if YUI_DEBUG %}true{% else %}false{% endif %}
 };
 // -->
 </script>
+
+<script type="text/javascript"
+    src="{% url "merge" filename="jquery.js" %}?v={{files_version}}">
+</script>
+<script type="text/javascript"
+    src="{% url "merge" filename="angular.js" %}?v={{files_version}}">
+</script>
+<script type="text/javascript"
+    src="{% url "merge" filename="ng-tags-input.js" %}?v={{files_version}}">
+</script>
+<script type="text/javascript"
+    src="{% url "merge" filename="maas-angular.js" %}?v={{files_version}}">
+</script>
+
 <script type="text/javascript"
     src="{% url "merge" filename="yui.js" %}?v={{files_version}}">
 </script>