#33 Display Images - Folders tree - hide decision buttons

Gorbush · Jul 28, 2018 · 5680caa · 5680caa
1 parent 52cb5e8
commit 5680caa
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/ui/web/src/main/resources/static/js/cmp/sourceBlock.js b/ui/web/src/main/resources/static/js/cmp/sourceBlock.js
@@ -320,7 +320,17 @@ var SourceBlock = {
                 var fullImageSrc = this.dataObject.filePath+"/"+this.dataObject.fileName;
                 fullImageSrc = encodeURIComponent(fullImageSrc).replace(/%2F/g, "/");
                 // var fullImagePic = "/pics/"+this.dataObject.filePath+"/"+this.dataObject.fileName;
-                this.matchingImageAnch.attr("href", "/srcs/"+fullImageSrc);
+                var hrefPicture = "";
+                if (this.dataObject.grade === "GALLERY") {
+                    hrefPicture = "/pics/"+fullImageSrc;
+                }
+                if (this.dataObject.grade === "IMPORT") {
+                    hrefPicture = "/srcs/"+fullImageSrc;
+                }
+                if (this.dataObject.grade === "SOURCE") {
+                    hrefPicture = "/srcs/"+fullImageSrc;
+                }
+                this.matchingImageAnch.attr("href", hrefPicture);
                 this.matchingImageAnch.attr("title", this.dataObject.label);
                 // this.status.text(this.dataObject.status);
                 // this.fileName.text(this.dataObject.fileName);

diff --git a/ui/web/src/main/resources/static/js/main.js b/ui/web/src/main/resources/static/js/main.js
@@ -3,7 +3,7 @@ var GalleryManager = {
     init: function () {
         GalleryManager.viewSwitcher = initViewSwitcher("#sourceViewSwitcher");
         GalleryManager.sourceList = SourceList.init({
-            showDecisionBlock: true,
+            showDecisionBlock: false,
             sourceDataProvider: "/sources/uni",
             breadcrumb: "#breadcrumblist",
             gallery: '#slideshow',

diff --git a/ui/web/src/main/resources/templates/main/importProgress.html b/ui/web/src/main/resources/templates/main/importProgress.html
@@ -92,7 +92,7 @@
         </div>
         <div id="importDetailsBrowser" class="col-sm-8" >
             <div class="indexRequestsTreeHeader" >
-                <div id="indexRequestTreeHeaderRightColumns"></div>
+                <div id="indexRequestTreeHeaderRightColumns" class="jstree-node"></div>
             </div>
             <div class="indexRequestsTreeHeader" >
                 <div id="indexRequestTreeHeaderTotalColumns" class="jstree-node"></div>