Skip to content

Commit

Permalink
ignore get last known element for now until fix in 3.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Lam, Doris T (393A) authored and Lam, Doris T (393A) committed Aug 20, 2018
1 parent 9fb2908 commit dd90429
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ module.exports = function(grunt) {
options: {
publish: [{
id: groupId + ':ve:zip',
version: '3.3.1',
version: '3.3.2',
path: 'deploy/'
}]
}
Expand Down
2 changes: 1 addition & 1 deletion app/js/mms/directives/veNav.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions src/services/ElementService.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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];
},
Expand Down

0 comments on commit dd90429

Please sign in to comment.