Skip to content

Commit

Permalink
Admin interface: circulation ui inclusion
Browse files Browse the repository at this point in the history
* suppress reroils-circulation-ui dependencies
* checkin with a given patron barcode
* requests validation
* add modal dialog for changes confirmation
* alert messages mecanism
* translations
* shared component mecanism
* root level services

Signed-off-by: Johnny Mariéthoz <Johnny.Mariethoz@rero.ch>
  • Loading branch information
jma committed Dec 10, 2018
1 parent 6d2e591 commit 1829e6e
Show file tree
Hide file tree
Showing 82 changed files with 4,327 additions and 2,436 deletions.
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ recursive-include rero_ils *.png
recursive-include rero_ils *.scss
recursive-include rero_ils *.txt
recursive-include tests *.py
recursive-include ui *.py

# added by check_manifest.py
include *.json
Expand Down
2 changes: 1 addition & 1 deletion rero_ils/bundles.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ def catalog(domain):
'js/rero_ils/admin/runtime.js',
'js/rero_ils/admin/polyfills.js',
'js/rero_ils/admin/styles.js',
'js/rero_ils/admin/scripts.js',
'js/rero_ils/admin/main.js',
'node_modules/jquery/jquery.min.js',
'node_modules/bootstrap-sass/assets/javascripts/bootstrap.js',
output='gen/rero_ils.modules.admin_ui_js.%(version)s.js'
)
Expand Down
13 changes: 10 additions & 3 deletions rero_ils/modules/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,17 @@ def is_accessible(self):
return (can_edit() or default_admin_permission_factory(self).can())


circulation_settings = {
# circulation_settings = {
# 'view_class': ILSManager,
# 'kwargs': dict(name='Circulation Settings',
# endpoint='circulation_settings',
# menu_icon_type='fa',
# menu_icon_value='fa-barcode')
# }
circulation = {
'view_class': ILSManager,
'kwargs': dict(name='Circulation Settings',
endpoint='circulation_settings',
'kwargs': dict(name='Circulation',
endpoint='circulation',
menu_icon_type='fa',
menu_icon_value='fa-barcode')
}
Expand Down
56 changes: 0 additions & 56 deletions rero_ils/modules/items/admin.py

This file was deleted.

38 changes: 0 additions & 38 deletions rero_ils/modules/items/bundles.py

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 1829e6e

Please sign in to comment.