Merge pull request #61 from Open-MBEE/hotfix/3.3.2

ignore get last known element for now until fix in 3.4.0
Open-MBEE · Aug 21, 2018 · 39a31d0 · 39a31d0
2 parents 885f774 + dd90429
commit 39a31d0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -355,7 +355,7 @@ module.exports = function(grunt) {
         options: {
           publish: [{
             id: groupId + ':ve:zip',
-            version: '3.3.1',
+            version: '3.3.2',
             path: 'deploy/'
           }]
         }

diff --git a/app/js/mms/directives/veNav.js b/app/js/mms/directives/veNav.js
@@ -87,7 +87,7 @@ function veNav($templateCache, $rootScope, $state, hotkeys, growl, $location, $u
             hotkeys.toggleCheatSheet();
         };
         scope.toggleAbout = function() {
-            scope.veV = '3.3.1';
+            scope.veV = '3.3.2';
             scope.mmsV = 'Loading...';
             ApplicationService.getMmsVersion().then(function(data) {
                 scope.mmsV = data;

diff --git a/src/services/ElementService.js b/src/services/ElementService.js
@@ -77,9 +77,9 @@ function ElementService($q, $http, URLService, UtilsService, CacheService, HttpS
         var requestCacheKey = getElementKey(reqOb);
         var url = URLService.getElementURL(reqOb);
         var key = url;
-        if (reqOb.includeRecentVersionElement) {
-            key = key + 'addRecentVersion';
-        }
+        //if (reqOb.includeRecentVersionElement) {
+        //    key = key + 'addRecentVersion';
+        //}
         // if it's in the inProgress queue get it immediately
         if (inProgress.hasOwnProperty(key)) { //change to change proirity if it's already in the queue
             HttpService.ping(key, weight);
@@ -106,16 +106,16 @@ function ElementService($q, $http, URLService, UtilsService, CacheService, HttpS
                 delete inProgress[key];
             },
             function(data, status, headers, config) {
-                if (reqOb.includeRecentVersionElement) {
+                /*if (reqOb.includeRecentVersionElement) {
                     _getLatestVersionOfElement(_.clone(reqOb)).then(function(element){
                         data.recentVersionOfElement = element;
                         URLService.handleHttpStatus(data, status, headers, config, deferred);
                     }, function() {
                         URLService.handleHttpStatus(data, status, headers, config, deferred);
                     });
-                } else {
+                } else {*/
                     URLService.handleHttpStatus(data, status, headers, config, deferred);
-                }
+                //}
 
                 delete inProgress[key];
             },