diff options
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/urls.py | 22 | ||||
| -rw-r--r-- | archaeological_finds/views.py | 8 |
2 files changed, 13 insertions, 17 deletions
diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py index ca7f10296..9a71c66d8 100644 --- a/archaeological_finds/urls.py +++ b/archaeological_finds/urls.py @@ -19,7 +19,7 @@ from django.conf.urls import url -from ishtar_common.utils import check_rights +from ishtar_common.utils import check_rights, get_urls_for_model from archaeological_finds import views from archaeological_operations.views import administrativeactfile_document @@ -166,10 +166,6 @@ urlpatterns = [ name='autocomplete-integritytype'), url(r'autocomplete-treatmentfile/$', views.autocomplete_treatmentfile, name='autocomplete-treatmentfile'), - url(r'get-find/own/(?P<type>.+)?$', views.get_find, - name='get-own-find', kwargs={'force_own': True}), - url(r'get-find/(?P<type>.+)?$', views.get_find, - name='get-find'), url(r'get-find-for-ope/own/(?P<type>.+)?$', views.get_find_for_ope, name='get-own-find-for-ope', kwargs={'force_own': True}), url(r'get-find-for-ope/(?P<type>.+)?$', views.get_find_for_ope, @@ -190,21 +186,13 @@ urlpatterns = [ name='show-findbasket'), url(r'^display-find/basket-(?P<pk>.+)/$', views.display_findbasket, name='display-findbasket'), - url(r'^show-find(?:/(?P<pk>.+))?/(?P<type>.+)?$', views.show_find, - name=models.Find.SHOW_URL), - url(r'^display-find/(?P<pk>.+)/$', views.display_find, - name='display-' + models.Find.SLUG), url(r'^show-historized-find/(?P<pk>.+)?/(?P<date>.+)?$', views.show_find, name='show-historized-find'), url(r'^revert-find/(?P<pk>.+)/(?P<date>.+)$', views.revert_find, name='revert-find'), - url(r'^get-treatment/(?P<type>.+)?$', - views.get_treatment, name='get-treatment'), url(r'get-treatment-shortcut/(?P<type>.+)?$', views.get_treatment, name='get-treatment-shortcut', kwargs={'full': 'shortcut'}), - url(r'^show-treatment(?:/(?P<pk>.+))?/(?P<type>.+)?$', views.show_treatment, - name=models.Treatment.SHOW_URL), url(r'show-historized-treatment/(?P<pk>.+)?/(?P<date>.+)?$', views.show_treatment, name='show-historized-treatment'), url(r'^revert-treatment/(?P<pk>.+)/(?P<date>.+)$', @@ -231,6 +219,8 @@ urlpatterns = [ kwargs={'treatment_file': True}), ] -# url(r'show-treatmentfile(?:/(?P<pk>.+))?/(?P<type>.+)?$', -# 'show_treatmentfile', -# name=models.TreatmentFile.SHOW_URL), +urlpatterns += get_urls_for_model(models.Find, views, own=True, + autocomplete=True) +urlpatterns += get_urls_for_model(models.Treatment, views, + autocomplete=True) + diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 850151578..76f1977e6 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -37,7 +37,7 @@ from ishtar_common.models import IshtarUser, get_current_profile from ishtar_common.views import get_autocomplete_generic, IshtarMixin, \ LoginRequiredMixin from ishtar_common.views_item import display_item, get_item, show_item, \ - revert_item + revert_item, get_autocomplete_item from ishtar_common.wizards import SearchWizard from wizards import * @@ -50,9 +50,15 @@ get_find_for_treatment = get_item( models.Find, 'get_find', 'find', own_table_cols=models.Find.TABLE_COLS_FOR_OPE, base_request={}) +autocomplete_find = get_autocomplete_item(model=models.Find) + + show_treatment = show_item(models.Treatment, 'treatment') revert_treatment = revert_item(models.Treatment) get_treatment = get_item(models.Treatment, 'get_treatment', 'treatment') +display_treatment = display_item(models.Treatment) + +autocomplete_treatment = get_autocomplete_item(model=models.Treatment) get_administrativeacttreatment = get_item( AdministrativeAct, 'get_administrativeacttreatment', |