admin: Wrong organisation on select menu

* Closes rero#389 Co-Authored-by: Bertrand Zuchuat <[email protected]>
Garfield-fr · Aug 22, 2019 · eb2adc0 · eb2adc0
1 parent 0b0c79a
commit eb2adc0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/rero_ils/modules/item_types/jsonschemas/form_item_types/item_type-v0.0.1.json b/rero_ils/modules/item_types/jsonschemas/form_item_types/item_type-v0.0.1.json
@@ -4,6 +4,7 @@
     "key": "organisation.$ref",
     "type": "select",
     "remoteRecordType": "organisations",
+    "remoteRecordFiltersByOwningOrganisation": "pid",
     "readonly": "true"
   },
   {

diff --git a/rero_ils/modules/libraries/jsonschemas/form_libraries/library-v0.0.1.json b/rero_ils/modules/libraries/jsonschemas/form_libraries/library-v0.0.1.json
@@ -7,7 +7,8 @@
         "title": "Organisation",
         "key": "organisation.$ref",
         "type": "select",
-        "remoteRecordType": "organisations"
+        "remoteRecordType": "organisations",
+        "remoteRecordFiltersByOwningOrganisation": "pid"
       },
       {
         "type": "flex",
@@ -59,4 +60,4 @@
       }
     ]
   }
-]
+]
diff --git a/rero_ils/modules/patron_types/jsonschemas/form_patron_types/patron_type-v0.0.1.json b/rero_ils/modules/patron_types/jsonschemas/form_patron_types/patron_type-v0.0.1.json
@@ -4,6 +4,7 @@
     "key": "organisation.$ref",
     "type": "select",
     "remoteRecordType": "organisations",
+    "remoteRecordFiltersByOwningOrganisation": "pid",
     "readonly": "true"
   },
   {

diff --git a/ui/src/app/records/editor/remote-select/remote-select.component.ts b/ui/src/app/records/editor/remote-select/remote-select.component.ts
@@ -59,10 +59,14 @@ export class RemoteSelectComponent implements OnInit {
       this.userService.loggedUser.subscribe(user => {
         // TODO: find a cleanest way to do it
         let query = '';
-        const fieldToFilter = this.options.remoteRecordFiltersByOwningLibrary;
+        let fieldToFilter = this.options.remoteRecordFiltersByOwningLibrary;
         if (fieldToFilter && !user.roles.some(role => role === 'system_librarian')) {
           query = `${fieldToFilter}:${user.library.pid}`;
         }
+        fieldToFilter = this.options.remoteRecordFiltersByOwningOrganisation;
+        if (fieldToFilter && user.roles.some(role => role === 'system_librarian')) {
+          query = `${fieldToFilter}:${user.library.organisation.pid}`;
+        }
         this.recordsService.getRecords('global', remoteRecordType, 1, 30, query).subscribe(data => {
           data.hits.hits.map(record => {
             const urlPrefix = this.apiService.getApiEntryPointByType(remoteRecordType, true);