Merge pull request #896 from OnroerendErfgoed/bugfix/883_enable_conce…

…ptscheme_buttons_in_admin_menu Bugfix/883 enable conceptscheme buttons in admin menu
OnroerendErfgoed · Jul 19, 2024 · 3d3b3d6 · 3d3b3d6
2 parents 23d1604 + 249dabc
commit 3d3b3d6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/atramhasis/static/admin/src/app/ui/AppUi.js b/atramhasis/static/admin/src/app/ui/AppUi.js
@@ -172,6 +172,15 @@ define([
 
       router.startup('#');
     },
+    refresh_conceptschemes: function () {
+      console.debug('AppUi::refresh_conceptschemes');
+      var message = 'Please manually reload the page to see the changes in the main menu.';
+      topic.publish('dGrowl', message, {
+        'title': 'New Provider added',
+        'sticky': false,
+        'channel': 'info'
+      });
+    },
 
     /**
      * Hide the 'Loading'-overlay.

diff --git a/atramhasis/static/admin/src/app/ui/dialogs/ManageProvidersDialog.js b/atramhasis/static/admin/src/app/ui/dialogs/ManageProvidersDialog.js
@@ -350,6 +350,7 @@ define([
             'channel': 'info'
           });
           this._reset(true);
+          this.parentNode.refresh_conceptschemes();
         }),
         lang.hitch(this, function (error) {
           var message = this._parseError(error);

diff --git a/atramhasis/static/admin/src/app/ui/widgets/SearchPane.js b/atramhasis/static/admin/src/app/ui/widgets/SearchPane.js
@@ -67,6 +67,7 @@ define([
       if (this.appUi.canCreateProviders) {
         domAttr.set(this.manageProvidersButton, 'disabled', false);
       }
+      this._initSelectedConceptSchemeAdmin();
     },
 
     init: function (scheme, store) {
@@ -163,15 +164,20 @@ define([
           this.emit('scheme.changed', {
             schemeId: this.conceptSchemeSelect.value
           });
-          // activate buttons for add and import, edit scheme
-          domAttr.set(this.addConceptButton, 'disabled', false);
-          domAttr.set(this.importConceptButton, 'disabled', false);
-          domAttr.set(this.editSchemeButton, 'disabled', false);
           this._search();
         }))
       );
     },
 
+    _initSelectedConceptSchemeAdmin: function () {
+      if (this.conceptSchemeList.length > 0) {
+        domAttr.set(this.addConceptButton, 'disabled', false);
+        domAttr.set(this.importConceptButton, 'disabled', false);
+        domAttr.set(this.editSchemeButton, 'disabled', false);
+        this._search();
+      }
+    },
+
     _createContextMenu: function () {
       var contextMenu = new Menu({});
       var pane = this;

diff --git a/atramhasis/static/admin/src/app/ui/widgets/templates/SearchPane.html b/atramhasis/static/admin/src/app/ui/widgets/templates/SearchPane.html
@@ -3,9 +3,7 @@
   <div class="search-form">
     <form data-dojo-attach-point="labelSearchForm" data-dojo-attach-event="onsubmit: _search">
         <div class="large-10 columns">
-          <select data-dojo-attach-point="conceptSchemeSelect">
-            <option value="-1" selected disabled>Select thesaurus</option>
-          </select>
+          <select data-dojo-attach-point="conceptSchemeSelect"></select>
         </div>
         <div class="large-2 columns edit-scheme-button">
           <button type="button" class="button tiny" href="#/conceptscheme/edit" data-dojo-attach-point="editSchemeButton"