From e654c582583416b67e5c12447df4224ee205da45 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 21 Jan 2017 13:10:08 +0100 Subject: Add a view to display items. Display find view. --- ishtar_common/templates/ishtar/display_item.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'ishtar_common/templates') diff --git a/ishtar_common/templates/ishtar/display_item.html b/ishtar_common/templates/ishtar/display_item.html index 87dda6dcf..e00fef05b 100644 --- a/ishtar_common/templates/ishtar/display_item.html +++ b/ishtar_common/templates/ishtar/display_item.html @@ -1,11 +1,10 @@ {% extends "base.html" %} {% load i18n %} -{% load url from future %} {% block content %} -

{{page_name}}

{% endblock %} -- cgit v1.2.3 From f02eaa8d0ab5a381b64b7108dc9f4a7c3ffdbcef Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Mon, 23 Jan 2017 13:01:07 +0100 Subject: Update gitlab links --- install/install-ishtar.sh | 2 +- install/install.sh | 2 +- ishtar_common/templates/welcome.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ishtar_common/templates') diff --git a/install/install-ishtar.sh b/install/install-ishtar.sh index 214813406..4c5995ca0 100644 --- a/install/install-ishtar.sh +++ b/install/install-ishtar.sh @@ -327,7 +327,7 @@ EOF mkdir -p $full_install_path cd $full_install_path ( set -x; git clone git://git.proxience.com/git/oook_replace.git 2> /dev/null ) - ( set -x; git clone https://gitlab.com/ishtar/ishtar.git 2> /dev/null ) + ( set -x; git clone https://gitlab.com/iggdrasil/ishtar.git 2> /dev/null ) cd ishtar git fetch 2> /dev/null git checkout $version 2> /dev/null diff --git a/install/install.sh b/install/install.sh index e1476e7af..7a9a55bd7 100755 --- a/install/install.sh +++ b/install/install.sh @@ -124,7 +124,7 @@ mkdir $INSTALL_PATH'/conf' cd $INSTALL_PATH echo ' * ishtar' -git clone https://gitlab.com/ishtar/ishtar.git 2> /dev/null +git clone https://gitlab.com/iggdrasil/ishtar.git 2> /dev/null # echo ' * oook!' # git clone git://git.proxience.com/git/oook_replace.git 2> /dev/null # ln -s $INSTALL_PATH'/oook_replace/oook_replace' $INSTALL_PATH'/ishtar/' diff --git a/ishtar_common/templates/welcome.html b/ishtar_common/templates/welcome.html index eb9de475e..508f7be02 100644 --- a/ishtar_common/templates/welcome.html +++ b/ishtar_common/templates/welcome.html @@ -8,5 +8,5 @@
  • {% trans "Presentation site and blog" %}{% trans ":"%} {% trans "stay tuned with Ishtar news!" %}
  • {% trans "Admin interface" %}{% trans ":"%} {% trans "for admin only." %}
  • {% trans "Forum" %}{% trans ":"%} {% trans "need help? find a new bug? a fantastic feature to propose? Here is the place to go." %}
    • -
  • {% trans "Source code" %} – {% trans "tickets" %}{% trans ":"%} {% trans "where the magic happens." %}
    • +
  • {% trans "Source code" %} – {% trans "tickets" %}{% trans ":"%} {% trans "where the magic happens." %}
    • -- cgit v1.2.3 From 2b8a1179293af734dbe701512a2b1f9d8b4f5010 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 23 Jan 2017 20:02:02 +0100 Subject: Fix inline_formset id in template --- ishtar_common/templates/blocks/inline_formset.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ishtar_common/templates') diff --git a/ishtar_common/templates/blocks/inline_formset.html b/ishtar_common/templates/blocks/inline_formset.html index 4d4042985..9c1daad28 100644 --- a/ishtar_common/templates/blocks/inline_formset.html +++ b/ishtar_common/templates/blocks/inline_formset.html @@ -1,6 +1,6 @@ {% load i18n %} {% if extra_formset.non_form_errors %}
    {{extra_formset.non_form_errors.as_ul}}
    {% endif %} - {% if header %} + {% if header %}
    {% for field in formset.0.visible_fields%} -- cgit v1.2.3 From 8cd9c70288f5aaeae55a8b6900ea10ad89378066 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 23 Jan 2017 20:02:24 +0100 Subject: pep8 --- archaeological_finds/models_finds.py | 6 +++--- ishtar_common/templates/ishtar/formset.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ishtar_common/templates') diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 45c750f66..e8b6135a8 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -551,9 +551,9 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): def _get_treatments(self, model, rel='upstream', limit=None): treatments, findtreats = [], [] q = model.objects.filter( - find_id=self.pk).order_by( - 'treatment_nb', 'treatment__start_date', - 'treatment__end_date') + find_id=self.pk).order_by( + 'treatment_nb', 'treatment__start_date', + 'treatment__end_date') for findtreat in q.distinct().all(): if findtreat.pk in findtreats: continue diff --git a/ishtar_common/templates/ishtar/formset.html b/ishtar_common/templates/ishtar/formset.html index c8a92165e..5454ae7e5 100644 --- a/ishtar_common/templates/ishtar/formset.html +++ b/ishtar_common/templates/ishtar/formset.html @@ -5,7 +5,7 @@
    {% csrf_token %} {% inline_formset ' ' formset %} - +
    {% endblock %} -- cgit v1.2.3
    {% trans caption %}