feat: Remove invenioSearchConfig and replace with invenioConfig

close #94 Signed-off-by: Bertrand Zuchuat <[email protected]>
rero · Sep 24, 2018 · a95df9b · a95df9b
1 parent bf5ebf6
commit a95df9b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 34 deletions.
diff --git a/rero_ils/bundles.py b/rero_ils/bundles.py
@@ -60,6 +60,7 @@ def catalog(domain):
 
 _detailed_js = NpmBundle(
     'js/rero_ils/documents_items.js',
+    'js/rero_ils/invenio_config.js',
     'js/rero_ils/detailed_app.js',
     filters='requirejs',
     depends=('node_modules/d3/*'),
@@ -87,6 +88,7 @@ def catalog(domain):
 
 _search_js = NpmBundle(
     'js/rero_ils/documents_items.js',
+    'js/rero_ils/invenio_config.js',
     'js/rero_ils/search_app.js',
     filters='requirejs',
     depends=('node_modules/invenio-search-js/dist/*.js', 'node_modules/d3/*'),

diff --git a/rero_ils/static/js/rero_ils/search_app.js b/rero_ils/static/js/rero_ils/search_app.js
@@ -37,10 +37,10 @@ require([
         document.getElementById("invenio-search"), [
           'angular-loading-bar',
           'invenioSearch',
+          'invenioConfig',
           'reroilsAppTranslations',
           'reroilsUtils',
-          'reroThumbnails',
-          'reroConfig'
+          'reroThumbnails'
         ]
       );
     });

diff --git a/rero_ils/static/js/rero_ils/thumbnail.js b/rero_ils/static/js/rero_ils/thumbnail.js
@@ -3,28 +3,6 @@ angular.module('reroilsAppTranslations')
      gettextCatalog.setCurrentLanguage(document.documentElement.lang);
   }]);
 
-angular.module('reroConfig', [])
-  .controller('configController', ['$scope', '$log', '$http', '$sce', function($scope, $log, $http, $sce) {
-    $scope.config = {
-        thumbnail_service_url: undefined
-    };
-    $scope.$on('config.init', configInit);
-    function configInit(init, config){
-        $scope.config = angular.fromJson(config);
-    };
-  }])
-  .directive('invenioSearchConfig', ['$log', function($log) {
-      return {
-        restrict: 'E',
-        controller: 'configController',
-        link: function (scope, element, attrs) {
-            scope.$broadcast(
-                'config.init', attrs.config
-            );
-        }
-      };
-  }])
-
 angular.module('reroThumbnails', [])
   .controller('thumbnailController', ['$scope', '$log', '$http', '$sce', function($scope, $log, $http, $sce) {
     $scope.thumbnail_url = '/static/images/icon_'+$scope.type+'.png';

diff --git a/rero_ils/templates/rero_ils/search.html b/rero_ils/templates/rero_ils/search.html
@@ -16,16 +16,16 @@
 
 {%- block body_inner %}
 <div id="invenio-search">
-  <invenio-search-config config='{{ {"thumbnail_service_url": config.RERO_ILS_THUMBNAIL_SERVICE_URL, "persons_label_order": config.RERO_ILS_PERSONS_LABEL_ORDER} | tojson }}'>
-  <invenio-search
-   search-endpoint="{{ config.SEARCH_UI_SEARCH_API }}"
-   search-extra-params='{% if search_extra_params %}{{search_extra_params|tojson}}{% endif %}'
-   search-hidden-params='{% if search_hidden_params %}{{search_hidden_params|tojson}}{% endif %}'
-   search-headers='{"Accept": "{{ config.SEARCH_UI_SEARCH_MIMETYPE|default('application/json')}}"}'
-  >
-  {{super()}}
-  </invenio-search>
-  </invenio-search-config>
+  <invenio-config config='{{ {"thumbnail_service_url": config.RERO_ILS_THUMBNAIL_SERVICE_URL, "persons_label_order": config.RERO_ILS_PERSONS_LABEL_ORDER} | tojson }}'>
+    <invenio-search
+     search-endpoint="{{ config.SEARCH_UI_SEARCH_API }}"
+     search-extra-params='{% if search_extra_params %}{{search_extra_params|tojson}}{% endif %}'
+     search-hidden-params='{% if search_hidden_params %}{{search_hidden_params|tojson}}{% endif %}'
+     search-headers='{"Accept": "{{ config.SEARCH_UI_SEARCH_MIMETYPE|default('application/json')}}"}'
+    >
+    {{super()}}
+    </invenio-search>
+  </invenio-config>
 </div>
 {%- endblock body_inner %}