diff --git a/src/app/basket/controllers/BasketController.php b/src/app/basket/controllers/BasketController.php index 06976ea57b67d6b84274ce31f75460a7e8db5a05..ce6189d49cd67e1d717cd78c1068c9f6f4b29476 100755 --- a/src/app/basket/controllers/BasketController.php +++ b/src/app/basket/controllers/BasketController.php @@ -494,7 +494,7 @@ class BasketController $data['list_display'] = json_encode($data['list_display']); if ($data['list_event'] == 'processDocument') { $listEventData = [ - 'canUpdate' => !empty($data['list_event_data']['canUpdate']), + 'canUpdateData' => !empty($data['list_event_data']['canUpdateData']), 'canUpdateModel' => !empty($data['list_event_data']['canUpdateModel']), 'defaultTab' => $data['list_event_data']['defaultTab'] ?? 'dashboard' ]; diff --git a/src/app/group/controllers/PrivilegeController.php b/src/app/group/controllers/PrivilegeController.php index 03057730d69ce62342ba8d31964c521d9aac4c63..98b9f0438e1dfa44116c439b5868b45c1de75aa8 100644 --- a/src/app/group/controllers/PrivilegeController.php +++ b/src/app/group/controllers/PrivilegeController.php @@ -295,8 +295,8 @@ class PrivilegeController $where = ['group_id in (?)', 'list_event = ?']; $data = [$groups, 'processDocument']; - if (!empty($args['canUpdate'])) { - $where[] = "list_event_data->>'canUpdate' = ?"; + if (!empty($args['canUpdateData'])) { + $where[] = "list_event_data->>'canUpdateData' = ?"; $data[] = 'true'; } if (!empty($args['canUpdateModel'])) { @@ -322,8 +322,8 @@ class PrivilegeController foreach ($assignedBaskets as $basket) { $where = ['basket_id = ?', 'group_id = ?', 'list_event = ?']; $data = [$basket['basket_id'], $basket['oldGroupId'], 'processDocument']; - if (!empty($args['canUpdate'])) { - $where[] = "list_event_data->>'canUpdate' = ?"; + if (!empty($args['canUpdateData'])) { + $where[] = "list_event_data->>'canUpdateData' = ?"; $data[] = 'true'; } if (!empty($args['canUpdateModel'])) { diff --git a/src/app/resource/controllers/ResourceControlController.php b/src/app/resource/controllers/ResourceControlController.php index 78f1be26bbb0d0a18e581b6e198d1bbafa844e47..7facefdcc8ffbc9b3c501b59e2448c65b544c66f 100644 --- a/src/app/resource/controllers/ResourceControlController.php +++ b/src/app/resource/controllers/ResourceControlController.php @@ -135,7 +135,7 @@ class ResourceControlController } if (!empty($body['modelId']) && $resource['model_id'] != $body['modelId']) { - if (!PrivilegeController::isResourceInProcess(['userId' => $GLOBALS['id'], 'resId' => $args['resId'], 'canUpdate' => true, 'canUpdateModel' => true])) { + if (!PrivilegeController::isResourceInProcess(['userId' => $GLOBALS['id'], 'resId' => $args['resId'], 'canUpdateData' => true, 'canUpdateModel' => true])) { return ['errors' => 'Model can not be modified']; } $indexingModel = IndexingModelModel::getById(['id' => $body['modelId'], 'select' => ['master', 'enabled']]); diff --git a/src/frontend/app/administration/basket/list/list-administration.component.html b/src/frontend/app/administration/basket/list/list-administration.component.html index 8f5ef96cc72b68c10c198c31f5f85c9ed84e583e..c79f6b29b687655be2b000dcf1d96bdee23d0d33 100644 --- a/src/frontend/app/administration/basket/list/list-administration.component.html +++ b/src/frontend/app/administration/basket/list/list-administration.component.html @@ -19,10 +19,10 @@ </mat-select> </mat-form-field> <div style="padding: 10px;"> - <mat-slide-toggle color="primary" [(ngModel)]="selectedProcessTool.canUpdate" (change)="toggleCanUpdate($event.checked)">{{lang.canUpdateData}}</mat-slide-toggle> + <mat-slide-toggle color="primary" [(ngModel)]="selectedProcessTool.canUpdateData" (change)="toggleCanUpdate($event.checked)">{{lang.canUpdateData}}</mat-slide-toggle> </div> <div style="padding: 10px;"> - <mat-slide-toggle color="primary" [(ngModel)]="selectedProcessTool.canUpdateModel" [disabled]="!selectedProcessTool.canUpdate">{{lang.canUpdateIndexingModel}}</mat-slide-toggle> + <mat-slide-toggle color="primary" [(ngModel)]="selectedProcessTool.canUpdateModel" [disabled]="!selectedProcessTool.canUpdateData">{{lang.canUpdateIndexingModel}}</mat-slide-toggle> </div> </div> <hr /> diff --git a/src/frontend/app/administration/basket/list/list-administration.component.ts b/src/frontend/app/administration/basket/list/list-administration.component.ts index eae76efd0a903f7e311845c28ce76326431e2547..10f85c5c0e3a46a8b64cb1a22912dae528aab329 100644 --- a/src/frontend/app/administration/basket/list/list-administration.component.ts +++ b/src/frontend/app/administration/basket/list/list-administration.component.ts @@ -212,7 +212,7 @@ export class ListAdministrationComponent implements OnInit { ]; selectedProcessTool: any = { defaultTab: null, - canUpdate: false, + canUpdateData: false, canUpdateModel: false, }; selectedProcessToolClone: string = null; @@ -242,7 +242,7 @@ export class ListAdministrationComponent implements OnInit { if (this.basketGroup.list_event === 'processDocument') { this.selectedProcessTool.defaultTab = this.basketGroup.list_event_data === null ? 'dashboard' : this.basketGroup.list_event_data.defaultTab; - this.selectedProcessTool.canUpdate = this.basketGroup.list_event_data === null ? false : this.basketGroup.list_event_data.canUpdate; + this.selectedProcessTool.canUpdateData = this.basketGroup.list_event_data === null ? false : this.basketGroup.list_event_data.canUpdateData; this.selectedProcessTool.canUpdateModel = this.basketGroup.list_event_data === null ? false : this.basketGroup.list_event_data.canUpdateModel; } diff --git a/src/frontend/app/process/process.component.ts b/src/frontend/app/process/process.component.ts index 18b418179494508b9fbfdf47744109a08057d35c..4639c885f92e9f75aad45fd0c6424fd03fc278c4 100755 --- a/src/frontend/app/process/process.component.ts +++ b/src/frontend/app/process/process.component.ts @@ -362,7 +362,7 @@ export class ProcessComponent implements OnInit, OnDestroy { if (this.isToolEnabled(data.listEventData.defaultTab)) { this.currentTool = data.listEventData.defaultTab; } - this.canEditData = data.listEventData.canUpdate; + this.canEditData = data.listEventData.canUpdateData; this.canChangeModel = data.listEventData.canUpdateModel; } }), diff --git a/test/unitTests/app/resource/ResControllerTest.php b/test/unitTests/app/resource/ResControllerTest.php index 39616a5785c5d5859cfe656bc981039ba65b1900..1d9cbda705f80597afe9371c0230fd49280b8e03 100755 --- a/test/unitTests/app/resource/ResControllerTest.php +++ b/test/unitTests/app/resource/ResControllerTest.php @@ -666,7 +666,7 @@ class ResControllerTest extends TestCase $this->assertSame(204, $response->getStatusCode()); \Basket\models\GroupBasketModel::update([ - 'set' => ['list_event_data' => '{"canUpdate": true, "defaultTab": "info", "canUpdateModel": true}'], + 'set' => ['list_event_data' => '{"canUpdateData": true, "defaultTab": "info", "canUpdateModel": true}'], 'where' => ['group_id = ?', 'basket_id = ?'], 'data' => ['COURRIER', 'QualificationBasket'] ]);