diff options
Diffstat (limited to '')
| -rw-r--r-- | accounts/templates/accounts/index.html | 2 | ||||
| -rw-r--r-- | accounts/views.py | 2 | ||||
| -rw-r--r-- | server/templates/server/doc_list.html | 6 | ||||
| -rw-r--r-- | server/templates/server/doc_list_readonly.html | 6 | ||||
| -rw-r--r-- | server/views.py | 4 | ||||
| -rw-r--r-- | version.txt | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/accounts/templates/accounts/index.html b/accounts/templates/accounts/index.html index 8ce5990..4eaa42e 100644 --- a/accounts/templates/accounts/index.html +++ b/accounts/templates/accounts/index.html @@ -55,7 +55,7 @@ <div class="input-field col l4 s12"> <select name="branca" disabled> <option value="" disabled {{branca_default}}>Nessuna</option> - <option value="colonia" {{branca_castorini}}>Castorini</option> + <option value="diga" {{branca_castorini}}>Castorini</option> <option value="muta" {{branca_lupetti}}>Lupetti</option> <option value="reparto" {{branca_esploratori}}>Esploratori</option> <option value="posto" {{branca_pionieri}}>Pionieri</option> diff --git a/accounts/views.py b/accounts/views.py index 88bd141..8ea48f2 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -641,7 +641,7 @@ def personal_wrapper(request, errors): branca_default = "selected" else: parent_group = request.user.groups.values_list('name', flat=True)[0] - if parent_group == "colonia": + if parent_group == "diga": branca_castorini = "selected" elif parent_group == "muta": branca_lupetti = "selected" diff --git a/server/templates/server/doc_list.html b/server/templates/server/doc_list.html index be18abf..45ea6e0 100644 --- a/server/templates/server/doc_list.html +++ b/server/templates/server/doc_list.html @@ -136,8 +136,8 @@ <a href="#!"><div class="chip" onClick="showAll()"> {{total_count}} Tutti </div></a> - <a href="#!"><div id="colonia_filter" class="chip {{color}} white-text" onClick="filterResults('colonia')"> - {{colonia_count}} Colonia + <a href="#!"><div id="diga_filter" class="chip {{color}} white-text" onClick="filterResults('diga')"> + {{diga_count}} Diga </div></a> <a href="#!"><div id="muta_filter" class="chip {{color}} white-text" onClick="filterResults('muta')"> {{muta_count}} Muta @@ -676,7 +676,7 @@ function filterResults(group_name) { function showAll() { var items = document.getElementsByClassName("item"); - document.getElementById("colonia_filter").className = "chip {{color}} white-text"; + document.getElementById("diga_filter").className = "chip {{color}} white-text"; document.getElementById("muta_filter").className = "chip {{color}} white-text"; document.getElementById("reparto_filter").className = "chip {{color}} white-text"; document.getElementById("posto_filter").className = "chip {{color}} white-text"; diff --git a/server/templates/server/doc_list_readonly.html b/server/templates/server/doc_list_readonly.html index 6db49c8..ac1ae6d 100644 --- a/server/templates/server/doc_list_readonly.html +++ b/server/templates/server/doc_list_readonly.html @@ -117,8 +117,8 @@ <a href="#!"><div class="chip" onClick="showAll()"> {{total_count}} Tutti </div></a> - <a href="#!"><div id="colonia_filter" class="chip {{color}} white-text" onClick="filterResults('colonia')"> - {{colonia_count}} Colonia + <a href="#!"><div id="diga_filter" class="chip {{color}} white-text" onClick="filterResults('diga')"> + {{diga_count}} Diga </div></a> <a href="#!"><div id="muta_filter" class="chip {{color}} white-text" onClick="filterResults('muta')"> {{muta_count}} Muta @@ -657,7 +657,7 @@ function filterResults(group_name) { function showAll() { var items = document.getElementsByClassName("item"); - document.getElementById("colonia_filter").className = "chip {{color}} white-text"; + document.getElementById("diga_filter").className = "chip {{color}} white-text"; document.getElementById("muta_filter").className = "chip {{color}} white-text"; document.getElementById("reparto_filter").className = "chip {{color}} white-text"; document.getElementById("posto_filter").className = "chip {{color}} white-text"; diff --git a/server/views.py b/server/views.py index 4133d3c..12b79e9 100644 --- a/server/views.py +++ b/server/views.py @@ -1237,7 +1237,7 @@ def doclist(request): 'error_text': error_text,
'settings': settings,
'total_count': documents.count,
- 'colonia_count': documents.filter(user__groups__name__contains="colonia").count,
+ 'diga_count': documents.filter(user__groups__name__contains="diga").count,
'muta_count': documents.filter(user__groups__name__contains="muta").count,
'reparto_count': documents.filter(user__groups__name__contains="reparto").count,
'posto_count': documents.filter(user__groups__name__contains="posto").count,
@@ -1467,7 +1467,7 @@ def doclist_readonly(request): 'error_text': error_text,
'settings': settings,
'total_count': documents.count,
- 'colonia_count': documents.filter(user__groups__name__contains="colonia").count,
+ 'diga_count': documents.filter(user__groups__name__contains="diga").count,
'muta_count': documents.filter(user__groups__name__contains="muta").count,
'reparto_count': documents.filter(user__groups__name__contains="reparto").count,
'posto_count': documents.filter(user__groups__name__contains="posto").count,
diff --git a/version.txt b/version.txt index 8abcdb6..9b601c0 100644 --- a/version.txt +++ b/version.txt @@ -1,2 +1,2 @@ version=0.6 -rev=7 +rev=8 |