summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/locale/fr/LC_MESSAGES/django.po175
-rw-r--r--ishtar_common/static/js/ishtar.js9
-rw-r--r--ishtar_common/static/media/images/info.pngbin0 -> 521 bytes
-rw-r--r--ishtar_common/static/media/style.css10
-rw-r--r--ishtar_common/templates/base.html17
-rw-r--r--ishtar_common/templates/blocks/JQueryJqGrid.html5
-rw-r--r--ishtar_common/templates/ishtar/sheet_organization.html2
-rw-r--r--ishtar_common/templates/ishtar/sheet_person.html2
-rw-r--r--ishtar_common/views.py2
-rw-r--r--ishtar_common/wizards.py2
10 files changed, 127 insertions, 97 deletions
diff --git a/ishtar_common/locale/fr/LC_MESSAGES/django.po b/ishtar_common/locale/fr/LC_MESSAGES/django.po
index dd62db01a..214393593 100644
--- a/ishtar_common/locale/fr/LC_MESSAGES/django.po
+++ b/ishtar_common/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-07 21:50+0100\n"
+"POT-Creation-Date: 2014-01-17 14:40+0100\n"
"PO-Revision-Date: 2010-12-09\n"
"Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
"Language-Team: \n"
@@ -68,12 +68,12 @@ msgstr "Vous devez sélectionner un élément."
msgid "Add a new item"
msgstr "Ajouter un nouvel élément"
-#: forms.py:155 models.py:637
+#: forms.py:155 models.py:648
msgid "Template"
msgstr "Patron"
#: forms_common.py:42 forms_common.py:82 forms_common.py:86
-#: forms_common.py:161 models.py:686 models.py:930
+#: forms_common.py:161 models.py:697 models.py:945
#: templates/ishtar/sheet_organization.html:16
#: templates/ishtar/sheet_person.html:19 templates/ishtar/sheet_person.html:29
msgid "Town"
@@ -97,57 +97,57 @@ msgstr ""
"<p class='example'>Par exemple tapez « saint denis 93 » pour obtenir la "
"commune Saint-Denis dans le département français de Seine-Saint-Denis.</p>"
-#: forms_common.py:56 forms_common.py:327 ishtar_menu.py:30 models.py:758
-#: models.py:821 models.py:855 templates/ishtar/sheet_person.html:6
+#: forms_common.py:56 forms_common.py:327 ishtar_menu.py:30 models.py:769
+#: models.py:836 models.py:870 templates/ishtar/sheet_person.html:6
msgid "Person"
msgstr "Individu"
-#: forms_common.py:70 forms_common.py:128 ishtar_menu.py:39 models.py:710
+#: forms_common.py:70 forms_common.py:128 ishtar_menu.py:39 models.py:721
#: templates/ishtar/sheet_organization.html:6
msgid "Organization"
msgstr "Organisation"
#: forms_common.py:72 forms_common.py:106 forms_common.py:124
-#: forms_common.py:153 models.py:636 models.py:705 models.py:751 models.py:916
+#: forms_common.py:153 models.py:647 models.py:716 models.py:762 models.py:931
#: templates/ishtar/sheet_organization.html:12
#: templates/ishtar/sheet_organization.html:24
#: templates/ishtar/sheet_person.html:12 templates/ishtar/sheet_person.html:25
msgid "Name"
msgstr "Nom"
-#: forms_common.py:74 models.py:699
+#: forms_common.py:74 models.py:710
msgid "Organization type"
msgstr "Type d'organisation"
-#: forms_common.py:76 forms_common.py:155 models.py:681
+#: forms_common.py:76 forms_common.py:155 models.py:692
#: templates/ishtar/sheet_organization.html:13
#: templates/ishtar/sheet_person.html:16 templates/ishtar/sheet_person.html:26
msgid "Address"
msgstr "Adresse"
-#: forms_common.py:78 forms_common.py:157 models.py:682
+#: forms_common.py:78 forms_common.py:157 models.py:693
#: templates/ishtar/sheet_organization.html:14
#: templates/ishtar/sheet_person.html:17 templates/ishtar/sheet_person.html:27
msgid "Address complement"
msgstr "Complément d'adresse"
-#: forms_common.py:80 forms_common.py:159 models.py:684
+#: forms_common.py:80 forms_common.py:159 models.py:695
#: templates/ishtar/sheet_organization.html:15
#: templates/ishtar/sheet_person.html:18 templates/ishtar/sheet_person.html:28
msgid "Postal code"
msgstr "Code postal"
-#: forms_common.py:83 forms_common.py:162 models.py:687
+#: forms_common.py:83 forms_common.py:162 models.py:698
msgid "Country"
msgstr "Pays"
-#: forms_common.py:85 models.py:689
+#: forms_common.py:85 models.py:700
#: templates/ishtar/sheet_organization.html:17
#: templates/ishtar/sheet_person.html:20 templates/ishtar/sheet_person.html:30
msgid "Phone"
msgstr "Téléphone"
-#: forms_common.py:107 forms_common.py:127 models.py:707 models.py:879
+#: forms_common.py:107 forms_common.py:127 models.py:718 models.py:894
#: templates/sheet_ope.html:85 templates/sheet_ope.html.py:105
#: templates/sheet_ope.html:126 templates/ishtar/sheet_organization.html:26
#: templates/ishtar/sheet_person.html:41 templates/ishtar/sheet_person.html:94
@@ -159,13 +159,13 @@ msgstr "Type"
msgid "Organization search"
msgstr "Recherche d'organisations"
-#: forms_common.py:125 forms_common.py:151 models.py:749
+#: forms_common.py:125 forms_common.py:151 models.py:760
#: templates/ishtar/sheet_organization.html:25
#: templates/ishtar/sheet_person.html:13
msgid "Surname"
msgstr "Prénom"
-#: forms_common.py:126 forms_common.py:164 forms_common.py:213 models.py:752
+#: forms_common.py:126 forms_common.py:164 forms_common.py:213 models.py:763
#: templates/ishtar/sheet_person.html:14
msgid "Email"
msgstr "Courriel"
@@ -178,7 +178,7 @@ msgstr "Recherche d'individus"
msgid "Identity"
msgstr "Identité"
-#: forms_common.py:150 forms_common.py:284 models.py:748 models.py:878
+#: forms_common.py:150 forms_common.py:284 models.py:759 models.py:893
#: templates/sheet_ope.html:104 templates/ishtar/sheet_person.html:93
#: templates/ishtar/blocks/window_tables/documents.html:5
msgid "Title"
@@ -188,7 +188,7 @@ msgstr "Titre"
msgid "Current organization"
msgstr "Organisation actuelle"
-#: forms_common.py:173 forms_common.py:195 forms_common.py:198 models.py:735
+#: forms_common.py:173 forms_common.py:195 forms_common.py:198 models.py:746
msgid "Person type"
msgstr "Type d'individu"
@@ -220,7 +220,7 @@ msgstr "Ce nom d'utilisateur existe déjà."
msgid "Send the new password by email?"
msgstr "Envoyer le nouveau mot de passe par courriel ?"
-#: forms_common.py:264 forms_common.py:276 models.py:931
+#: forms_common.py:264 forms_common.py:276 models.py:946
#: templates/ishtar/sheet_person.html:71
msgid "Towns"
msgstr "Communes"
@@ -233,23 +233,23 @@ msgstr "Il y a des communes identiques."
msgid "Documentation informations"
msgstr "Information sur le document"
-#: forms_common.py:286 forms_common.py:305 models.py:874
+#: forms_common.py:286 forms_common.py:305 models.py:889
msgid "Source type"
msgstr "Type de source"
-#: forms_common.py:288 models.py:883
+#: forms_common.py:288 models.py:898
msgid "Numerical ressource (web address)"
msgstr "Ressource numérique (adresse web)"
-#: forms_common.py:289 models.py:885
+#: forms_common.py:289 models.py:900
msgid "Receipt date"
msgstr "Date de réception"
-#: forms_common.py:291 models.py:887
+#: forms_common.py:291 models.py:902
msgid "Creation date"
msgstr "Date de création"
-#: forms_common.py:302 forms_common.py:321 forms_common.py:351 models.py:860
+#: forms_common.py:302 forms_common.py:321 forms_common.py:351 models.py:875
msgid "Author"
msgstr "Auteur"
@@ -257,7 +257,7 @@ msgstr "Auteur"
msgid "Would you like to delete this documentation?"
msgstr "Voulez vous supprimer ce document ?"
-#: forms_common.py:328 models.py:851 models.py:857
+#: forms_common.py:328 models.py:866 models.py:872
msgid "Author type"
msgstr "Type d'auteur"
@@ -269,7 +269,7 @@ msgstr "Sélection d'auteur"
msgid "There are identical authors."
msgstr "Il y a des auteurs identiques."
-#: forms_common.py:361 models.py:861 models.py:880
+#: forms_common.py:361 models.py:876 models.py:895
#: templates/sheet_ope.html:106
#: templates/ishtar/blocks/window_tables/documents.html:7
msgid "Authors"
@@ -303,7 +303,7 @@ msgstr "Un élément sélectionné n'est pas valide."
msgid "This item already exist."
msgstr "Cet élément existe déjà."
-#: models.py:198 models.py:525 models.py:669
+#: models.py:198 models.py:536 models.py:680
msgid "Label"
msgstr "Libellé"
@@ -315,7 +315,7 @@ msgstr "Identifiant textuel"
msgid "Comment"
msgstr "Commentaire"
-#: models.py:202 models.py:640
+#: models.py:202 models.py:651
msgid "Available"
msgstr "Disponible"
@@ -323,176 +323,176 @@ msgstr "Disponible"
msgid "Last editor"
msgstr "Dernier éditeur"
-#: models.py:513 models.py:524
+#: models.py:524 models.py:535
msgid "URL name"
msgstr "Nom de l'URL"
-#: models.py:515 models.py:523
+#: models.py:526 models.py:534
msgid "Wizard"
msgstr "Assistant"
-#: models.py:522
+#: models.py:533
msgid "Order"
msgstr "Ordre"
-#: models.py:527
+#: models.py:538
msgid "Wizard step"
msgstr "Étape de l'assistant"
-#: models.py:570 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83
+#: models.py:581 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83
#: templates/ishtar/sheet_person.html:38 templates/ishtar/sheet_person.html:67
#: templates/ishtar/sheet_person.html:92
msgid "Year"
msgstr "Année"
-#: models.py:573 models.py:670
+#: models.py:584 models.py:681
#: templates/ishtar/dashboards/dashboard_main.html:74
msgid "Number"
msgstr "Nombre"
-#: models.py:635
+#: models.py:646
msgid "Administrative Act"
msgstr "Acte administratif"
-#: models.py:638
+#: models.py:649
msgid "Associated object"
msgstr "Objet associé"
-#: models.py:643
+#: models.py:654
msgid "Document template"
msgstr "Patron de document"
-#: models.py:644
+#: models.py:655
msgid "Document templates"
msgstr "Patrons de documents"
-#: models.py:673
+#: models.py:684
msgid "Department"
msgstr "Département"
-#: models.py:674
+#: models.py:685
msgid "Departments"
msgstr "Départements"
-#: models.py:690 templates/ishtar/sheet_organization.html:18
+#: models.py:701 templates/ishtar/sheet_organization.html:18
#: templates/ishtar/sheet_person.html:21 templates/ishtar/sheet_person.html:31
msgid "Mobile phone"
msgstr "Téléphone portable"
-#: models.py:700
+#: models.py:711
msgid "Organization types"
msgstr "Types d'organisation"
-#: models.py:711
+#: models.py:722
msgid "Organizations"
msgstr "Organisations"
-#: models.py:713
+#: models.py:724
msgid "Can view all Organization"
msgstr "Peut voir toutes les Organisations"
-#: models.py:714
+#: models.py:725
msgid "Can view own Organization"
msgstr "Peut voir sa propre Organisation"
-#: models.py:715
+#: models.py:726
msgid "Can add own Organization"
msgstr "Peut ajouter sa propre Organisation"
-#: models.py:716
+#: models.py:727
msgid "Can change own Organization"
msgstr "Peut changer sa propre Organisation"
-#: models.py:717
+#: models.py:728
msgid "Can delete own Organization"
msgstr "Peut supprimer sa propre Organisation"
-#: models.py:732
+#: models.py:743
msgid "Groups"
msgstr "Groupes"
-#: models.py:736
+#: models.py:747
msgid "Person types"
msgstr "Types d'individu"
-#: models.py:741
+#: models.py:752
msgid "Mr"
msgstr "M."
-#: models.py:742
+#: models.py:753
msgid "Miss"
msgstr "Mlle"
-#: models.py:743
+#: models.py:754
msgid "Mrs"
msgstr "Mme"
-#: models.py:744
+#: models.py:755
msgid "Doctor"
msgstr "Dr."
-#: models.py:753 models.py:785
+#: models.py:764 models.py:798
msgid "Types"
msgstr "Types"
-#: models.py:755
+#: models.py:766
msgid "Is attached to"
msgstr "Est rattaché à"
-#: models.py:759
+#: models.py:770
msgid "Persons"
msgstr "Individus"
-#: models.py:761
+#: models.py:772
msgid "Can view all Person"
msgstr "Peut voir toutes les Personnes"
-#: models.py:762
+#: models.py:773
msgid "Can view own Person"
msgstr "Peut voir sa propre Personne"
-#: models.py:763
+#: models.py:774
msgid "Can add own Person"
msgstr "Peut ajouter sa propre Personne"
-#: models.py:764
+#: models.py:775
msgid "Can change own Person"
msgstr "Peut changer sa propre Personne"
-#: models.py:765
+#: models.py:776
msgid "Can delete own Person"
msgstr "Peut supprimer sa propre Personne"
-#: models.py:825
+#: models.py:840
msgid "Ishtar user"
msgstr "Utilisateur d'Ishtar"
-#: models.py:826
+#: models.py:841
msgid "Ishtar users"
msgstr "Utilisateurs d'Ishtar"
-#: models.py:852
+#: models.py:867
msgid "Author types"
msgstr "Types d'auteur"
-#: models.py:875
+#: models.py:890
msgid "Source types"
msgstr "Types de source"
-#: models.py:888 templates/ishtar/sheet_person.html:39
+#: models.py:903 templates/ishtar/sheet_person.html:39
#: templates/ishtar/sheet_person.html:66
msgid "Ref."
msgstr "Réf."
-#: models.py:890
+#: models.py:905
msgid "Internal reference"
msgstr "Référence interne"
-#: models.py:917
+#: models.py:932
msgid "Surface (m²)"
msgstr "Area (m²)"
-#: models.py:918 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
+#: models.py:933 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
msgid "Localisation"
msgstr "Localisation"
@@ -524,33 +524,34 @@ msgstr "Oui"
msgid "False"
msgstr "Non"
-#: views.py:380 templates/ishtar/sheet_organization.html:34
+#: views.py:380 templates/base.html:75
+#: templates/ishtar/sheet_organization.html:34
#: templates/ishtar/sheet_person.html:56 templates/ishtar/sheet_person.html:82
msgid "Details"
msgstr "Détails"
-#: views.py:588 views.py:636
+#: views.py:590 views.py:638
msgid "Operation not permitted."
msgstr "Opération non permise"
-#: views.py:591
+#: views.py:593
#, python-format
msgid "New %s"
msgstr "Nouveau %s"
-#: views.py:654
+#: views.py:656
msgid "Archaeological files"
msgstr "Dossiers archéologiques"
-#: views.py:657
+#: views.py:659
msgid "Operations"
msgstr "Opérations"
-#: views.py:660
+#: views.py:662
msgid "Context records"
msgstr "Unité d'Enregistrement"
-#: views.py:663
+#: views.py:665
msgid "Finds"
msgstr "Mobilier"
@@ -617,37 +618,37 @@ msgstr "Merci pour l'intérêt que vous portez au projet."
msgid "The %(app_name)s team"
msgstr "L'équipe %(app_name)s"
-#: templates/base.html:28
+#: templates/base.html:29
msgid "Logged in"
msgstr "Connecté"
-#: templates/base.html:29
+#: templates/base.html:30
msgid "Log out"
msgstr "Déconnexion"
-#: templates/base.html:30
+#: templates/base.html:31
msgid "Change password"
msgstr "Changement de mot de passe"
-#: templates/base.html:32 templates/registration/activate.html:10
+#: templates/base.html:33 templates/registration/activate.html:10
#: templates/registration/login.html:8 templates/registration/login.html:10
#: templates/registration/password_reset_complete.html:8
msgid "Log in"
msgstr "Connexion"
-#: templates/base.html:38
+#: templates/base.html:39
msgid "Lang"
msgstr "Langue"
-#: templates/base.html:38 templates/base.html.py:83
+#: templates/base.html:39 templates/base.html.py:86
msgid ":"
msgstr " :"
-#: templates/base.html:63
+#: templates/base.html:64
msgid "Default selected items"
msgstr "Éléments sélectionnés par défaut"
-#: templates/base.html:81
+#: templates/base.html:84
msgid "Current items"
msgstr "Éléments courants"
@@ -914,6 +915,10 @@ msgstr "simple"
msgid "full"
msgstr "complet"
+#: templates/blocks/JQueryJqGrid.html:81
+msgid "An error as occured during search. Check your query fields."
+msgstr "Une erreur est intervenue sur cette recherche. Vérifiez la pertinence de vos critères de recherche."
+
#: templates/blocks/form_snippet.html:9
msgid "Help"
msgstr "Aide"
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index b4a079ef8..0a15bfc23 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -105,6 +105,15 @@ function load_window(url, speed, on_success){
});
}
+function load_current_window(url, model_name){
+ var id = $("#current_" + model_name).val();
+ if (!id) return;
+ url = url.split('/');
+ url[url.length - 1] = id;
+ url.push('');
+ return load_window(url.join('/'));
+}
+
function load_url(url){
$("#progress").show();
$.ajax({
diff --git a/ishtar_common/static/media/images/info.png b/ishtar_common/static/media/images/info.png
new file mode 100644
index 000000000..6d9beb9ed
--- /dev/null
+++ b/ishtar_common/static/media/images/info.png
Binary files differ
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index e9f1a8bab..bbd14dd99 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -161,6 +161,16 @@ div#logo{
background-repeat:no-repeat;
}
+.display_details{
+ display:inline-block;
+ font-size:0;
+ color:transparent;
+ width:18px;
+ height:16px;
+ background-image:url(images/info.png);
+ background-repeat:no-repeat;
+}
+
div#language_form_div{
position:absolute;
right:0;
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index e235df60a..baab57409 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -1,4 +1,5 @@
{% load i18n %}
+{% load url from future%}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -26,10 +27,10 @@
{% block header %}
{% if user.is_authenticated %}
{% trans "Logged in" %}: {{ user.username }}
- (<a href="{% url auth_logout %}">{% trans "Log out" %}</a> |
- <a href="{% url auth_password_change %}">{% trans "Change password" %}</a>)
+ (<a href="{% url 'auth_logout' %}">{% trans "Log out" %}</a> |
+ <a href="{% url 'auth_password_change' %}">{% trans "Change password" %}</a>)
{% else %}
- <strong><a href="{% url auth_login %}">{% trans "Log in" %}</a></strong>
+ <strong><a href="{% url 'auth_login' %}">{% trans "Log in" %}</a></strong>
{% endif %}
{% if LANGUAGES|length > 1 %}
<div id="language_form_div">
@@ -58,7 +59,7 @@
</div>
<div id="context_menu">
{% block context %}{% if current_menu %}
- <form method="post" action="{% url update-current-item %}">
+ <form method="post" action="{% url 'update-current-item' %}">
<fieldset>
<legend>{% trans "Default selected items"%}</legend>
<table id='current_items'>
@@ -70,7 +71,9 @@
<option value=''>--</option>
{% for val, label, selected in items %}<option value='{{val}}'{%if selected%} selected="selected"{%endif%}>{{label}}</option>
{% endfor %}</select>
- </td>
+ </td>{% with 'show-'|add:model_name as model_url%}
+ <td><a href='#' onclick='load_current_window("{% url model_url 0 %}", "{{model_name}}");' class='display_details'>{% trans "Details" %}</a></td>
+ {% endwith %}
</tr>
{% endfor %}
</table>
@@ -92,10 +95,10 @@
{% if menu_item.childs %}<li id='section-{{forloop.parentloop.counter}}-{{forloop.counter}}'>{{menu_item.label}}
<ul>
{% for menu_subitem in menu_item.childs %}{%if menu_subitem.available%}
- <li id='section-{{forloop.parentloop.parentloop.counter}}-{{forloop.parentloop.counter}}-{{forloop.counter}}'{%ifequal menu_subitem.idx CURRENT_ACTION%} class='selected'{%endifequal%}><a href='{% url action menu_subitem.idx%}'>{{menu_subitem.label}}</a></li>
+ <li id='section-{{forloop.parentloop.parentloop.counter}}-{{forloop.parentloop.counter}}-{{forloop.counter}}'{%ifequal menu_subitem.idx CURRENT_ACTION%} class='selected'{%endifequal%}><a href='{% url 'action' menu_subitem.idx%}'>{{menu_subitem.label}}</a></li>
{%endif%}{% endfor %}</ul></li>
{%else%}
- <li{%ifequal menu_item.idx CURRENT_ACTION%} class='selected'{%endifequal%}><a href='{% url action menu_item.idx%}'>{{menu_item.label}}</a></li>
+ <li{%ifequal menu_item.idx CURRENT_ACTION%} class='selected'{%endifequal%}><a href='{% url 'action' menu_item.idx%}'>{{menu_item.label}}</a></li>
{%endif%}{% endif %}{% endfor %}
</ul>
</li>{%endif%}
diff --git a/ishtar_common/templates/blocks/JQueryJqGrid.html b/ishtar_common/templates/blocks/JQueryJqGrid.html
index 919a01bc1..6f8c94cbb 100644
--- a/ishtar_common/templates/blocks/JQueryJqGrid.html
+++ b/ishtar_common/templates/blocks/JQueryJqGrid.html
@@ -65,7 +65,7 @@ jQuery(document).ready(function(){
colNames:['id', '', {{col_names|safe}}],
colModel:[
{name:'id', index:'id', hidden:true},
- {name:'link', index:'link', width:80},
+ {name:'link', index:'link', width:30},
{{extra_cols|safe}}
],
sortname: 'value',
@@ -77,6 +77,9 @@ jQuery(document).ready(function(){
width:740,
rowNum:20,
jsonReader : {repeatitems: false},
+ loadError: function (jqXHR, textStatus, errorThrown) {
+ alert("{% trans "An error as occured during search. Check your query fields." %}");
+ }
});
{% if multiple %}
jQuery("#add_button_{{name}}").click(function (){
diff --git a/ishtar_common/templates/ishtar/sheet_organization.html b/ishtar_common/templates/ishtar/sheet_organization.html
index 64f8fe5c7..e58d84887 100644
--- a/ishtar_common/templates/ishtar/sheet_organization.html
+++ b/ishtar_common/templates/ishtar/sheet_organization.html
@@ -31,7 +31,7 @@
<td class='string'>{{person.name|default:""}}</td>
<td class='string'>{{person.surname|default:""}}</td>
<td>{% for type in person.person_types.all %}{% if forloop.counter0 %}, {% endif %}{{type.label}}{% endfor %}</td>
- <td class='link'><a href="#" onclick='load_window("{%url show-person person.pk ''%}")'>{% trans "Details" %}</a></td>
+ <td class='link'><a class='display_details' href="#" onclick='load_window("{%url show-person person.pk ''%}")'>{% trans "Details" %}</a></td>
</tr>
{% empty %}
<tr><td colspan="8" class='no_items'>{% trans "No person in this organization" %}</td></tr>
diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html
index 88fe59f41..47d3bc1cb 100644
--- a/ishtar_common/templates/ishtar/sheet_person.html
+++ b/ishtar_common/templates/ishtar/sheet_person.html
@@ -53,7 +53,7 @@
<td class='string'>{{operation.in_charge|default:""}}</td>
<td>{{operation.start_date|default:""}}</td>
<td>{{operation.excavation_end_date|default:""}}</td>
- <td class='link'><a href="#" onclick='load_window("{%url show-operation operation.pk ''%}")'>{% trans "Details" %}</a></td>
+ <td class='link'><a href="#" class='display_details' onclick='load_window("{%url show-operation operation.pk ''%}")'>{% trans "Details" %}</a></td>
</tr>
{% empty %}
<tr><td colspan="8" class='no_items'>{% trans "No operation associated to this person" %}</td></tr>
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index e02ed3f8b..5fc717c9f 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -392,7 +392,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
if sign == '-':
datas = reversed(datas)
datas = list(datas)[start:end]
- link_template = "<a href='#' onclick='load_window(\"%%s\")'>%s</a>" % \
+ link_template = "<a class='display_details' href='#' onclick='load_window(\"%%s\")'>%s</a>" % \
(unicode(_("Details")))
if data_type == "json":
rows = []
diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py
index d29a8458f..d506c8552 100644
--- a/ishtar_common/wizards.py
+++ b/ishtar_common/wizards.py
@@ -620,7 +620,7 @@ class Wizard(NamedUrlWizardView):
storage.reset()
data = storage.get_step_data(form_key)
if not data:
- data = {}#MultiValueDict()
+ data = MultiValueDict()
key = key if key.startswith(form_key) else form_key + '-' + key
data[key] = value
storage.set_step_data(form_key, data)
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-20 13:27:34 +0000