From 298012f0b030331fcfac7fa996ff36c36d437d89 Mon Sep 17 00:00:00 2001
From: suzanadirla <suzana@dirla.ro>
Date: Thu, 9 Nov 2017 16:24:34 +0200
Subject: [PATCH] [ADF-1605] [Destination picker] Folder cannot be selected if
 user has Contributor permissions on it (#2630)

fix issue by allowing to select as destination the folder with "create" permission
fix display of disabled folder icon
---
 .../src/assets/images/ft_ic_folder_disable.svg            | 6 +++---
 .../content-node-selector.component.ts                    | 4 ++--
 .../src/data/share-datatable-adapter.ts                   | 8 ++++++++
 .../src/services/node-actions.service.ts                  | 2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ng2-components/ng2-alfresco-core/src/assets/images/ft_ic_folder_disable.svg b/ng2-components/ng2-alfresco-core/src/assets/images/ft_ic_folder_disable.svg
index 469a08ceaf..b8082cb503 100644
--- a/ng2-components/ng2-alfresco-core/src/assets/images/ft_ic_folder_disable.svg
+++ b/ng2-components/ng2-alfresco-core/src/assets/images/ft_ic_folder_disable.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="16" viewBox="0 0 20 16">
-    <path fill="#000" fill-opacity=".28" fill-rule="evenodd" d="M8 0H2C.9 0 0 .9 0 2v12c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2h-8L8 0z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><rect id="backgroundrect" width="100%" height="100%" x="0" y="0" fill="none" stroke="none" class="" style=""/>
+    
+<g class="currentLayer" style=""><title>Layer 1</title><path fill="#000" fill-opacity=".28" fill-rule="evenodd" d="M9.986754953861237,3.973509907722475 H3.986754953861237 C2.8867549538612365,3.973509907722475 1.986754953861237,4.8735099077224735 1.986754953861237,5.973509907722473 v12 c0,1.1 0.9,2 2,2 h16 c1.1,0 2,-0.9 2,-2 V7.973509907722473 c0,-1.1 -0.9,-2 -2,-2 h-8 L9.986754953861237,3.973509907722475 z" id="svg_1" class=""/></g></svg>
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.ts
index 713c2e335f..ce3b76db1f 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.ts
@@ -255,12 +255,12 @@ export class ContentNodeSelectorComponent implements OnInit {
     }
 
     /**
-     * Selects node as choosen if it has the right permission, clears the selection otherwise
+     * Selects node as chosen if it has the right permission, clears the selection otherwise
      *
      * @param entry
      */
     private attemptNodeSelection(entry: MinimalNodeEntryEntity): void {
-        if (this.contentService.hasPermission(entry, 'update')) {
+        if (this.contentService.hasPermission(entry, 'create')) {
             this.chosenNode = entry;
         } else {
             this.resetChosenNode();
diff --git a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts
index f6e11ac433..3496417509 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts
@@ -92,6 +92,14 @@ export class ShareDataTableAdapter implements DataTableAdapter {
         }
 
         if (col.key === '$thumbnail') {
+
+            if (this.imageResolver) {
+                let resolved = this.imageResolver(row, col);
+                if (resolved) {
+                    return resolved;
+                }
+            }
+
             const node = (<ShareDataRow> row).node;
 
             if (node.entry.isFolder) {
diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/node-actions.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/node-actions.service.ts
index 29f0fe5544..2bb94424be 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/services/node-actions.service.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/services/node-actions.service.ts
@@ -123,7 +123,7 @@ export class NodeActionsService {
 
     private imageResolver(row: ShareDataRow, col: DataColumn): string|null {
         const entry: MinimalNodeEntryEntity = row.node.entry;
-        if (!this.contentService.hasPermission(entry, 'update')) {
+        if (!this.contentService.hasPermission(entry, 'create')) {
             return this.documentListService.getMimeTypeIcon('disable/folder');
         }