Skip to content

Commit

Permalink
Merge branch 'release/3.2.0'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	Gruntfile.js
  • Loading branch information
@skhudiky
skhudiky committed Oct 9, 2017
2 parents 452e711 + d4b287d commit dc91b93
Show file tree
Hide file tree
Showing 73 changed files with 1,304 additions and 10,495 deletions.
2 changes: 1 addition & 1 deletion Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ module.exports = function(grunt) {
options: {
publish: [{
id: 'gov.nasa.jpl:evm:zip',
version: '3.1.0',
version: '3.2.0',
path: 'deploy/'
}]
}
Expand Down
Binary file added app/assets/alfresco-icon-sm.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions app/assets/arrow-change.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions app/assets/arrowhead.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions app/assets/location-feedback.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 21 additions & 20 deletions app/js/mms/app.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.borderLayout', 'ui.bootstrap', 'ui.router', 'ui.tree', 'angular-growl', 'cfp.hotkeys', 'angulartics', 'angulartics.piwik', 'diff-match-patch', 'ngStorage'])
angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.borderLayout', 'ui.bootstrap', 'ui.router', 'ui.tree', 'angular-growl', 'cfp.hotkeys', 'angulartics', 'angulartics.piwik', 'diff-match-patch', 'ngStorage', 'ngAnimate'])
.config(function($stateProvider, $urlRouterProvider, $httpProvider) {


$urlRouterProvider.rule(function ($injector, $location) {
var locationPath = $location.url();
if (locationPath.indexOf('full%23') > 0)
Expand Down Expand Up @@ -64,7 +64,7 @@ angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.bor
growl.error(reason.message);
});
};
}
}
}
}
})
Expand All @@ -82,7 +82,7 @@ angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.bor
});
return deferred.promise;
},
orgObs: function($stateParams, ProjectService, ticket) {
orgObs: function($stateParams, ProjectService, ticket) {
return ProjectService.getOrgs();
}
},
Expand Down Expand Up @@ -129,11 +129,11 @@ angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.bor
for (var i = 0; i < projectArray.length; i++) {
if(projectArray[i].id === project.id){
return 1;
}
}
}
return 0;
};

$scope.continue = function() {
if (orgId && projectId) {
$scope.spin = true;
Expand Down Expand Up @@ -209,7 +209,7 @@ angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.bor
},
views: {
'nav@': {
template: '<ve-nav mms-title="ve_title" mms-org="org" mms-orgs="orgs" mms-project="project" mms-projects="projects" mms-ref="ref" mms-branch="branch" mms-branches="branches" mms-tag="tag" mms-tags="tags" mms-search="search"></ve-nav>',
template: '<ve-nav mms-title="ve_title" mms-org="org" mms-orgs="orgs" mms-project="project" mms-projects="projects" mms-ref="ref" mms-branch="branch" mms-branches="branches" mms-tag="tag" mms-tags="tags" mms-search="search"></ve-nav>',
controller: function ($scope, $rootScope, orgOb, orgObs, projectOb, projectObs, refOb, branchOb, branchObs, tagOb, tagObs, search) {
$rootScope.ve_title = orgOb.name;
$scope.org = orgOb;
Expand Down Expand Up @@ -271,6 +271,7 @@ angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.bor
groupObs: function($stateParams, ProjectService, ticket) {
return ProjectService.getGroups($stateParams.projectId, $stateParams.refId);
},
groupOb: function(){ return null;},
documentOb: function($stateParams, $q, ElementService, ViewService, refOb, projectOb, ticket) {
var deferred = $q.defer();
var eid = $stateParams.projectId + '_cover';
Expand All @@ -287,11 +288,11 @@ angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.bor
deferred.resolve(null);
} else {
ViewService.createView({
_projectId: $stateParams.projectId,
_projectId: $stateParams.projectId,
_refId: $stateParams.refId,
id: 'holding_bin_' + $stateParams.projectId
},{
viewName: projectOb.name + ' Cover Page',
viewName: projectOb.name + ' Cover Page',
viewId: eid
}, 2).then(function(data) {
deferred.resolve(data);
Expand All @@ -317,7 +318,7 @@ angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.bor
},
views: {
'nav@': {
template: '<ve-nav mms-title="ve_title" mms-org="org" mms-orgs="orgs" mms-project="project" mms-projects="projects" mms-ref="ref" mms-branch="branch" mms-branches="branches" mms-tag="tag" mms-tags="tags" mms-search="search"></ve-nav>',
template: '<ve-nav mms-title="ve_title" mms-org="org" mms-orgs="orgs" mms-project="project" mms-projects="projects" mms-ref="ref" mms-branch="branch" mms-branches="branches" mms-tag="tag" mms-tags="tags" mms-search="search"></ve-nav>',
controller: function ($scope, $rootScope, orgOb, orgObs, projectOb, projectObs, refOb, branchOb, branchObs, tagOb, tagObs, search) {
$rootScope.ve_title = orgOb.name;
$scope.org = orgOb;
Expand Down Expand Up @@ -363,7 +364,7 @@ angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.bor
'toolbar-right@': {
template: '<mms-toolbar buttons="buttons" on-click="onClick(button)" mms-tb-api="tbApi"></mms-toolbar>',
controller: 'ToolbarCtrl'
}
}
}
})
.state('project.ref.manage', { //not needed right now, for managing mounts
Expand Down Expand Up @@ -393,11 +394,11 @@ angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.bor
ElementService.getElement({projectId: $stateParams.projectId, refId: $stateParams.refId, elementId: groupId})
.then(function(groupElement) {
ViewService.createView({
_projectId: $stateParams.projectId,
_projectId: $stateParams.projectId,
_refId: $stateParams.refId,
id: groupId
},{
viewName: groupElement.name + ' Cover Page',
viewName: groupElement.name + ' Cover Page',
viewId: eid
}, 2)
.then(function(data) {
Expand Down Expand Up @@ -473,7 +474,7 @@ angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.bor
}
})
.state('project.ref.document', {
url: '/documents/:documentId',
url: '/documents/:documentId',
resolve: {
documentOb: function($stateParams, ElementService, ticket) {
return ElementService.getElement({
Expand All @@ -486,7 +487,7 @@ angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.bor
viewOb: function(documentOb) {
return documentOb;
},
groupOb: function(groupObs, documentOb, ProjectService, ticket) {
groupOb: function(groupObs, documentOb) {
var group = null;
if(documentOb) {
for(var i = 0; i < groupObs.length; i++) {
Expand Down Expand Up @@ -521,7 +522,7 @@ angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.bor
'pane-left@': {
templateUrl: 'partials/mms/pane-left.html',
controller: 'TreeCtrl'
},
},
'pane-center@': {
templateUrl: 'partials/mms/pane-center.html',
controller: 'ViewCtrl'
Expand All @@ -546,7 +547,7 @@ angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.bor
elementId: $stateParams.viewId
}, 2);
},
groupOb: function(groupObs, documentOb, ProjectService, ticket) {
groupOb: function(groupObs, documentOb) {
var group = null;
if(documentOb) {
for(var i = 0; i < groupObs.length; i++) {
Expand Down Expand Up @@ -586,7 +587,7 @@ angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.bor
})
.state('project.ref.document.order', {
url: '/order',
views: {
views: {
'pane-center@': {
templateUrl: 'partials/mms/reorder-views.html',
controller: 'ReorderCtrl'
Expand All @@ -595,7 +596,7 @@ angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.bor
})
.state('project.ref.document.full', {
url: '/full',
views: {
views: {
'pane-center@': {
templateUrl: 'partials/mms/full-doc.html',
controller: 'FullDocCtrl'
Expand All @@ -608,7 +609,7 @@ angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.bor
return {
'responseError': function(rejection) {
if(rejection.status === 401){ //rejection.config.url
$rootScope.$broadcast("mms.unauthorized", rejection);
$rootScope.$broadcast("mms.unauthorized", rejection);
}
return $q.reject(rejection);
},
Expand Down
2 changes: 0 additions & 2 deletions app/js/mms/controllers/controller.utils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,6 @@ function MmsAppUtils($q, $uibModal, $timeout, $location, $window, $templateCache
$rootScope.ve_bbApi.setToggleState('tree-full-document', true);
$state.go('project.ref.document.full', {search: undefined});
}
}, function() {
deferred.reject();
});
return deferred.promise;
};
Expand Down
19 changes: 15 additions & 4 deletions app/js/mms/controllers/fulldoc.controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
/* Controllers */

angular.module('mmsApp')
.controller('FullDocCtrl', ['$scope', '$rootScope', '$state', '$stateParams', '$window', '$element', 'hotkeys', 'growl',
'MmsAppUtils', 'UxService', 'search', '_', 'documentOb', 'projectOb', 'refOb',
function($scope, $rootScope, $state, $stateParams, $window, $element, hotkeys, growl,
MmsAppUtils, UxService, search, _, documentOb, projectOb, refOb) {
.controller('FullDocCtrl', ['$scope', '$rootScope', '$state', '$element', 'hotkeys', 'growl', '_',
'MmsAppUtils', 'UxService', 'search', 'orgOb', 'projectOb', 'refOb', 'groupOb', 'documentOb',
function($scope, $rootScope, $state, $element, hotkeys, growl, _,
MmsAppUtils, UxService, search, orgOb, projectOb, refOb, groupOb, documentOb) {

$rootScope.ve_fullDocMode = true;

Expand Down Expand Up @@ -130,6 +130,17 @@ function($scope, $rootScope, $state, $stateParams, $window, $element, hotkeys, g
views.splice(sibIndex+1, 0, buildViewElt(vId, curSec) );
});

$scope.docLibLink = '';
if (groupOb !== null) {
$scope.docLibLink = groupOb._link;
} else if (documentOb !== null && documentOb._groupId !== undefined && documentOb._groupId !== null) {
$scope.docLibLink = '/share/page/repository#filter=path|/Sites/' + orgOb.id + '/documentLibrary/' +
projectOb.id + '/' + documentOb._groupId;
} else {
$scope.docLibLink = '/share/page/repository#filter=path|/Sites/' + orgOb.id + '/documentLibrary/' +
projectOb.id;
}

$scope.bbApi = {
init: function() {
if (documentOb && documentOb._editable && refOb.type === 'Branch') {
Expand Down
10 changes: 5 additions & 5 deletions app/js/mms/controllers/tool.controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function($scope, $rootScope, $state, $uibModal, $q, $timeout, hotkeys,
$rootScope.ve_edits = {};
$scope.presentElemEditCnts = {};

// Set edit count for tracker view
// Set edit count for tracker view
$scope.veEditsLength = function() {
return Object.keys($rootScope.ve_edits).length;
};
Expand Down Expand Up @@ -132,7 +132,7 @@ function($scope, $rootScope, $state, $uibModal, $q, $timeout, hotkeys,
});

$scope.$on('presentationElem.cancel', function(event, editOb) {
cleanUpEdit(editOb);
cleanUpEdit(editOb);
});

var elementSelected = function(event, elementOb, commitId) {
Expand All @@ -141,7 +141,7 @@ function($scope, $rootScope, $state, $uibModal, $q, $timeout, hotkeys,
$scope.specInfo.refId = elementOb._refId;
$scope.specInfo.commitId = commitId ? commitId : elementOb._commitId;
$rootScope.ve_tbApi.select('element-viewer');

showPane('element');
if ($scope.specApi.setEditing) {
$scope.specApi.setEditing(false);
Expand Down Expand Up @@ -188,7 +188,7 @@ function($scope, $rootScope, $state, $uibModal, $q, $timeout, hotkeys,
$scope.viewContentsOrderApi.setEditing(true);
showPane('reorder');
});

var elementSaving = false;
$scope.$on('element-editor-save', function() {
save(false);
Expand All @@ -210,7 +210,7 @@ function($scope, $rootScope, $state, $uibModal, $q, $timeout, hotkeys,
$scope.specApi.save().then(function(data) {
elementSaving = false;
growl.success('Save Successful');
if (continueEdit)
if (continueEdit)
return;
var edit = $scope.specApi.getEdits();
var key = edit.id + '|' + edit._projectId + '|' + edit._refId;
Expand Down
15 changes: 13 additions & 2 deletions app/js/mms/controllers/view.controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
angular.module('mmsApp')
.controller('ViewCtrl', ['$scope', '$rootScope', '$state', '$stateParams', '$timeout',
'$element', 'hotkeys', 'MmsAppUtils', 'UxService', 'growl',
'search', 'projectOb', 'documentOb', 'viewOb', 'refOb',
'search', 'orgOb', 'projectOb', 'refOb', 'groupOb', 'documentOb', 'viewOb',
function($scope, $rootScope, $state, $stateParams, $timeout, $element, hotkeys, MmsAppUtils, UxService, growl,
search, projectOb, documentOb, viewOb, refOb) {
search, orgOb, projectOb, refOb, groupOb, documentOb, viewOb) {

function isPageLoading() {
if ($element.find('.isLoading').length > 0) {
Expand Down Expand Up @@ -68,6 +68,17 @@ angular.module('mmsApp')
map: {}
};

$scope.docLibLink = '';
if (groupOb !== null) {
$scope.docLibLink = groupOb._link;
} else if (documentOb !== null && documentOb._groupId !== undefined && documentOb._groupId !== null) {
$scope.docLibLink = '/share/page/repository#filter=path|/Sites/' + orgOb.id + '/documentLibrary/' +
projectOb.id + '/' + documentOb._groupId;
} else {
$scope.docLibLink = '/share/page/repository#filter=path|/Sites/' + orgOb.id + '/documentLibrary/' +
projectOb.id;
}

$scope.bbApi = {
init: function() {
if (viewOb && viewOb._editable && refOb.type === 'Branch') {
Expand Down
Loading

0 comments on commit dc91b93

Please sign in to comment.