Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Remove invenioSearchConfig and replace with invenioConfig #99

Merged
merged 1 commit into from
Sep 24, 2018
+14 −34
Merged

feat: Remove invenioSearchConfig and replace with invenioConfig #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions rero_ils/bundles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/*'),
Expand Down Expand Up @@ -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/*'),
Expand Down
4 changes: 2 additions & 2 deletions rero_ils/static/js/rero_ils/search_app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ require([
document.getElementById("invenio-search"), [
'angular-loading-bar',
'invenioSearch',
'invenioConfig',
'reroilsAppTranslations',
'reroilsUtils',
'reroThumbnails',
'reroConfig'
'reroThumbnails'
]
);
});
Expand Down
22 changes: 0 additions & 22 deletions rero_ils/static/js/rero_ils/thumbnail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
20 changes: 10 additions & 10 deletions rero_ils/templates/rero_ils/search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down