FIX #12091 TIME 0:20 disabled current resId in searchList

src/app/resource/controllers/ResController.php

@@ -943,7 +943,7 @@ class ResController extends ResourceControlController
 
         try {
             $res = ResModel::getOnView(['select' => ['res_id'], 'where' => ['res_id in (?)', "({$whereClause})"], 'data' => [$args['resources'], $args['userId'], $entities, $args['userId']]]);
-            return $res;
+            return array_column($res, 'res_id');
         } catch (\Exception $e) {
             return [];
         }

src/frontend/app/adv-search/list/search-adv-list.component.html

@@ -25,7 +25,7 @@
             </mat-header-cell>
             <mat-cell *matCellDef="let row" style="width: 70px;flex: initial;">
                 <mat-checkbox color="primary" [checked]="row.checked" (change)="toggleRes($event,row)"
-                    (click)="$event.stopPropagation();">
+                    (click)="$event.stopPropagation();" [disabled]="row.resId == currentResId">
                 </mat-checkbox>
             </mat-cell>
         </ng-container>
@@ -71,4 +71,4 @@
         <mat-header-row *matHeaderRowDef="displayedColumnsResource"></mat-header-row>
         <mat-row *matRowDef="let row; columns: displayedColumnsResource;" class="rowData"></mat-row>
     </mat-table>
-</div>
+</div>
\ No newline at end of file

src/frontend/app/adv-search/list/search-adv-list.component.ts

@@ -38,6 +38,7 @@ export class SearchAdvListComponent implements OnInit {
     searchResource = new FormControl();
 
     @Input('search') search: string = '';
+    @Input('currentResId') currentResId: number;
 
     @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator;
     @ViewChild('tableResourceListSort', { static: true }) sort: MatSort;
@@ -129,9 +130,12 @@ export class SearchAdvListComponent implements OnInit {
         this.selectedRes = [];
         if (e.checked) {
             this.data.forEach((element: any) => {
-                element['checked'] = true;
+                if (element['resId'] != this.currentResId) {
+                    element['checked'] = true;
+                }
             });
-            this.selectedRes = JSON.parse(JSON.stringify(this.allResInSearch));
+            let selectResEnabled = this.allResInSearch.filter(elem => elem != this.currentResId)
+            this.selectedRes = JSON.parse(JSON.stringify(selectResEnabled));
         } else {
             this.data.forEach((element: any) => {
                 element['checked'] = false;

src/frontend/app/linkedResource/linkResourceModal/link-resource-modal.component.html

@@ -7,7 +7,7 @@
     </button></h1>
 <mat-dialog-content class="modal-container">
     <app-criteria-tool (searchUrlGenerated)="launchSearch($event)" [defaultCriteria]="['resourceField','contactField']"></app-criteria-tool>
-    <search-adv-list #appSearchAdvList></search-adv-list>
+    <search-adv-list #appSearchAdvList [currentResId]="data.resId"></search-adv-list>
 </mat-dialog-content>
 <div mat-dialog-actions class="actions">
     <button mat-raised-button color="primary" [disabled]="appSearchAdvList.getSelectedRessources().length === 0"