Image and File Editor Fix

OPSILab · Oct 10, 2018 · e6741cc · e6741cc
1 parent 33bca57
commit e6741cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/IdraPortal/src/main/webapp/catalogues/Catalogue.html b/IdraPortal/src/main/webapp/catalogues/Catalogue.html
@@ -36,7 +36,8 @@
 						onchange="angular.element(this).scope().imageUpload(this)"
 						accept=".jpg, .png, .jpeg, .gif, .bmp, .tif, .tiff|images/*">
 					</span>
-					<button ng-disabled="imageRead==''" type="button"
+					<button ng-disabled="imageRead=='' && node.image.imageData==''
+					" type="button"
 						class="btn btn-primary btn-xs" style="margin: 0px"
 						ng-click="openCropModal()">Crop</button>
 				</div>
@@ -253,7 +254,7 @@ <h3 class="modal-title">Image Crop</h3>
 <script type="text/ng-template" id="DumpEditor.html">
 <div class="modal-header">
 	<button type="button" class="close" aria-hidden="true" ng-click="cancel()">x</button>
-    <h3 class="modal-title">Dump Editor</h3>
+    <h3 class="modal-title">File Editor</h3>
 </div>
 <div class="modal-body row">
 	<div class="toolbar">

diff --git a/IdraPortal/src/main/webapp/catalogues/single_catalogue.js b/IdraPortal/src/main/webapp/catalogues/single_catalogue.js
@@ -131,7 +131,10 @@ angular.module("IdraPlatform").controller('CatalogueCtrl',['$scope','$http','con
 				size: 'lg',
 				resolve: {
 					image: function(){
-						return $scope.imageRead;
+						if($scope.imageRead!='')
+							return $scope.imageRead;
+						else if($scope.node.image.imageData!='')
+							return $scope.node.image.imageData;
 					}
 				}
 			});