Merge "Closes-Bug: #1544828 Do not cache the project list in config p…

…age."
Juniper · Feb 23, 2016 · 569ca34 · 569ca34
2 parents 8832f4a + fb3f1ed
commit 569ca34
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/webroot/common/ui/js/controller.utils.js b/webroot/common/ui/js/controller.utils.js
@@ -221,12 +221,13 @@ define([
 
                         $(contentContainer).html(dataErrorTemplate(dataErrorConfig));
                     }
-                },
+                }/*,
                 cacheConfig : {
                     ucid: ctwc.UCID_BC_ALL_SA_SETS,
                     loadOnTimeout: false,
                     cacheTimeout: cowc.DOMAIN_CACHE_UPDATE_INTERVAL
                 }
+                */
             }
         };
 
@@ -265,7 +266,7 @@ define([
         };
 
         this.getProjectListModelConfig = function(domainObj, dropdownOptions) {
-            return {
+            var modelConfig = {
                 remote: {
                     ajaxConfig: {
                         url: ctwc.getProjectsURL(domainObj,
@@ -287,13 +288,18 @@ define([
                         $(contentContainer).html(dataErrorTemplate(dataErrorConfig));
                     }
                 },
-                cacheConfig : {
+            };
+            if ((null == dropdownOptions) ||
+                (null == dropdownOptions['config']) ||
+                (false == dropdownOptions['config'])) {
+                modelConfig.cacheConfig = {
                     ucid: ctwc.get(ctwc.UCID_BC_DOMAIN_ALL_PROJECTS,
                                    domainObj.name),
                     loadOnTimeout: false,
                     cacheTimeout: cowc.PROJECT_CACHE_UPDATE_INTERVAL
-                }
-            };
+                };
+            }
+            return modelConfig;
         };
 
         this.getDNSListModelConfig = function(dns) {