diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-12 22:38:09 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-12 22:38:09 +0200 |
| commit | 167654c4d096870f3fcd5203cf0dc15f21d47cdc (patch) | |
| tree | da9b2d12da59dfbd36eee9c43462f87d8f3ecd54 /ishtar_common | |
| parent | 5f9fe6a2718afacc1126c5d8c6312c887b5f960c (diff) | |
| download | Ishtar-167654c4d096870f3fcd5203cf0dc15f21d47cdc.tar.bz2 Ishtar-167654c4d096870f3fcd5203cf0dc15f21d47cdc.zip | |
Treament file dashboard: add filter form (refs #3381)
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html | 2 | ||||
| -rw-r--r-- | ishtar_common/views.py | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html index c3a8a58a8..2650282ca 100644 --- a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html +++ b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html @@ -178,7 +178,7 @@ $('#search_{{unique_id}}').click(function (){ return false; }); -{% if item_name == 'files' or item_name == "operations" or item_name == "treatments" or item_name == "treatment_types" %} +{% if item_name == 'files' or item_name == "operations" or item_name == "treatments" or item_name == "treatmentfiles" %} load_jquerydate_{{item_name}}_after(); load_jquerydate_{{item_name}}_before(); {% endif %} diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 4aa452641..94e4c1582 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -63,7 +63,8 @@ from archaeological_finds.models import Find, Treatment, TreatmentFile, \ from archaeological_operations.forms import DashboardForm as DashboardFormOpe from archaeological_files.forms import DashboardForm as DashboardFormFile -from archaeological_finds.forms import DashboardTreatmentForm +from archaeological_finds.forms import DashboardTreatmentForm, \ + DashboardTreatmentFileForm from ishtar_common.forms import FinalForm, FinalDeleteForm from ishtar_common.widgets import JQueryAutoComplete @@ -1461,7 +1462,8 @@ def dashboard_main(request, dct, obj_id=None, *args, **kwargs): DASHBOARD_FORMS = { 'files': DashboardFormFile, 'operations': DashboardFormOpe, - 'treatments': DashboardTreatmentForm + 'treatments': DashboardTreatmentForm, + 'treatmentfiles': DashboardTreatmentFileForm } @@ -1478,9 +1480,9 @@ def dashboard_main_detail(request, item_name): slicing, date_source, fltr, show_detail = 'year', None, {}, False profile = models.get_current_profile() has_form = (item_name == 'files' and profile.files) \ - or item_name == 'operations' \ - or (item_name in ('treatmentfiles', 'treatments') - and profile.warehouse) + or item_name == 'operations' \ + or (item_name in ('treatmentfiles', 'treatments') + and profile.warehouse) if has_form: slicing = 'month' if item_name in DASHBOARD_FORMS: |