- prefix user uploaded image with _hidden_image

- fix img url - add base url if it doesn't already have it
- revert modifier display for now
- fix cover page creation putting in 2 in doc

Author: dlamoris

app/js/mms/app.js

@@ -422,7 +422,7 @@ angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.bor
                             },{
                                 viewName: projectOb.name + ' Cover Page',
                                 viewId: eid
-                            }, 2).then(function(data) {
+                            }).then(function(data) {
                                 deferred.resolve(data);
                             }, function(reason2) {
                                 deferred.resolve(null);

src/directives/Utils.js

@@ -973,6 +973,9 @@ function Utils($q, $uibModal, $timeout, $templateCache, $compile, $window, URLSe
     var fixImgSrc = function(imgDom) {
         var src = imgDom.attr('src');
         if (src) {
+            if (src.indexOf('http') < 0) {
+                src = URLService.getRoot() + src;
+            }
             imgDom.attr('src', src + '?token=' + AuthService.getToken());
         }
         if (imgDom.width() < 860) { //keep image relative centered with text if less than 9 in

src/directives/mmsCkEditor.js

@@ -504,7 +504,7 @@ function mmsCkeditor($uibModal, $templateCache, $timeout, growl, CKEDITOR, _, Ca
                 var formData = new FormData();
                 var xhr = fileLoader.xhr;
 
-                xhr.open( 'POST', URLService.getPutArtifactsURL({projectId: scope.mmsProjectId, refId: scope.mmsRefId, elementId: UtilsService.createMmsId().replace('MMS', 'VE')}), true );                
+                xhr.open( 'POST', URLService.getPutArtifactsURL({projectId: scope.mmsProjectId, refId: scope.mmsRefId, elementId: UtilsService.createMmsId().replace('MMS', '_hidden_image')}), true );                
                 //xhr.withCredentials = true;
                 xhr.setRequestHeader('Authorization', URLService.getAuthorizationHeaderValue());
                 formData.append('file', fileLoader.file, fileLoader.fileName );

src/directives/mmsSpec.js

@@ -96,11 +96,12 @@ function mmsSpec(Utils, URLService, AuthService, ElementService, UtilsService, V
         };
 
         var getModifier = function(modifier) {
-            AuthService.getUserData(modifier).then(function(modifierData){
+            return modifier;
+            /*AuthService.getUserData(modifier).then(function(modifierData){
                 return modifierData.users[0];
             }, function() {
                 return modifier;
-            });
+            });*/
         };
 
         if (scope.mmsElement) {
@@ -154,11 +155,12 @@ function mmsSpec(Utils, URLService, AuthService, ElementService, UtilsService, V
                     return;
                 }
                 scope.element = data;
-                AuthService.getUserData(data._modifier).then(function(modifierData){
+                scope.modifier = data._modifier;
+                /*AuthService.getUserData(data._modifier).then(function(modifierData){
                     scope.modifier = modifierData.users[0];
                 }, function() {
                     scope.modifier = data._modifier;
-                });
+                });*/
                 Utils.setupValCf(scope);
                 if (!scope.mmsCommitId || scope.mmsCommitId === 'latest') {
                     ElementService.search(reqOb, {

src/directives/mmsView.js

@@ -106,11 +106,12 @@ function mmsView(Utils, AuthService, ViewService, ElementService, $templateCache
                 if (elem._modified > $scope.modified && type !== 'Comment') {
                     $scope.modified = elem._modified;
                     if (elem._modifier) {
-                        AuthService.getUserData(elem._modifier).then(function(modifierData){
+                        $scope.modifier = elem._modifier;
+                        /*AuthService.getUserData(elem._modifier).then(function(modifierData){
                                 $scope.modifier = modifierData.users[0];
                         }, function() {
                             $scope.modifier = elem._modifier;
-                        });
+                        });*/
                     }
                 }
                 if ($scope.mmsViewApi && $scope.mmsViewApi.elementTranscluded)
@@ -187,22 +188,24 @@ function mmsView(Utils, AuthService, ViewService, ElementService, $templateCache
                     //getting cached individual elements should be faster
                     scope.view = data;
                     scope.modified = data._modified;
-                    AuthService.getUserData(data._modifier).then(function(modifierData){
+                    scope.modifier = data._modifier;
+                    /*AuthService.getUserData(data._modifier).then(function(modifierData){
                         scope.modifier = modifierData.users[0];
                     }, function() {
                         scope.modifier = data._modifier;
-                    });
+                    });*/
                     return;
                 }
                 ViewService.getViewElements(reqOb, 1)
                 .finally(function() {
                     scope.view = data;
                     scope.modified = data._modified;
-                    AuthService.getUserData(data._modifier).then(function(modifierData){
+                    scope.modifier = data._modifier;
+                    /*AuthService.getUserData(data._modifier).then(function(modifierData){
                         scope.modifier = modifierData.users[0];
                     }, function() {
                         scope.modifier = data._modifier;
-                    });
+                    });*/
                     element.removeClass('isLoading');
                 });
             }, function(reason) {