From 31091ce112add01a5e543e384ef6ce683ed5c338 Mon Sep 17 00:00:00 2001 From: wei-kuochen Date: Wed, 17 Aug 2022 15:35:36 +0900 Subject: [PATCH] weko#33208 edit index by role --- .../app/tree-list2/tree-list2.component.ts | 41 ++++++++++++------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/app-tree-index-edit/src/app/tree-list2/tree-list2.component.ts b/app-tree-index-edit/src/app/tree-list2/tree-list2.component.ts index ad28bd4..ebc010d 100644 --- a/app-tree-index-edit/src/app/tree-list2/tree-list2.component.ts +++ b/app-tree-index-edit/src/app/tree-list2/tree-list2.component.ts @@ -87,7 +87,8 @@ export class TreeList2Component implements OnInit { biblio_flag: false, display_format: '1', thumbnail_delete_flag: false, - image_name: '' + image_name: '', + can_edit: false }; public roleModel = { browsing_role_able: [], @@ -151,6 +152,7 @@ export class TreeList2Component implements OnInit { RSS_Icon: [], Display: [], Del_Success: [], + Del_failure: [], Add_Update_Success: [], Err_File_Ext: [], Enter_Required_Fields: [], @@ -160,7 +162,7 @@ export class TreeList2Component implements OnInit { private imgSrc = ''; private uploadFlg = false; private privousUploadFlg = false; - public deleteFlg = false; + public deleteFlg = true; private checkIndexNameFlg= false; private checkIndexLinkFlg= false; @@ -285,7 +287,10 @@ export class TreeList2Component implements OnInit { this.setIndexTree(); this.setRootDetailInit(); }).then(() => this.deleteFlg = false) - .catch(() => this.deleteFlg = false); + .catch(() => { + this.deleteFlg = false; + alert(this.langJson.Del_failure[1]); + }); } else { // 削除サービスを呼び出し this.treeList2Service.delOrMoveNodeInfo(this.selNodeId, 'all').then(res => { @@ -300,7 +305,10 @@ export class TreeList2Component implements OnInit { this.setRootDetailInit(); }) .then(() => this.deleteFlg = false) - .catch(() => this.deleteFlg = false); + .catch(() => { + this.deleteFlg = false; + alert(this.langJson.Del_failure[1]); + }); } } $('input[name=uploadFile]').val(''); @@ -362,11 +370,17 @@ export class TreeList2Component implements OnInit { this.uploadFlg = false; this.checkIndexNameFlg = false; this.checkIndexLinkFlg = false; - if (this.selNodeId != '0') { - this.inputFlg = true; - const modTreeDetailUrl = document.getElementById('mod_tree_detail').innerText + this.selNodeId; - this.treeList2Service.getNodeInfo(modTreeDetailUrl).then(res => { - this.detailData = res; + this.inputFlg = true; + const modTreeDetailUrl = document.getElementById('mod_tree_detail').innerText + this.selNodeId; + this.treeList2Service.getNodeInfo(modTreeDetailUrl).then(res => { + this.detailData = res; + this.deleteFlg = false; + if (!this.detailData.can_edit) { + this.deleteFlg = true; + this.inputFlg = false; + this.detailData.comment = ''; + } + if (this.selNodeId != '0') { if (this.detailData.image_name != '') { const urlArr = window.location.href.split('/'); this.imgSrc = urlArr[0] + '//' + urlArr[2] + this.detailData.image_name; @@ -374,11 +388,10 @@ export class TreeList2Component implements OnInit { } else { this.privousUploadFlg = false; } - - }); - } else { - this.setRootDetailInit(); - } + } else { + this.setRootDetailInit(); + } + }); } /**