From 8a51fc7c6b885fe7f59529e515e063b2b3093c6e Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 20 May 2015 00:50:01 +0200 Subject: Install: put ODT_TEMPLATE in local_settings --- install/install.sh | 1 + install/local_settings.py.sample | 2 ++ 2 files changed, 3 insertions(+) diff --git a/install/install.sh b/install/install.sh index 7dadfe422..3f9181bb0 100755 --- a/install/install.sh +++ b/install/install.sh @@ -136,6 +136,7 @@ APP_DIR=$INSTALL_PATH'/ishtar/'$APP_NAME echo '* load parameters' sed -s "s|#APP_NAME#|$APP_NAME|g;\ + s|#INSTALL_PATH#|$INSTALL_PATH|g;\ s|#DATE#|$DATE|g;\ s|#PROJECT_NAME#|$PROJECT_NAME|g;\ s|#DB_HOST#|$DB_HOST|g;\ diff --git a/install/local_settings.py.sample b/install/local_settings.py.sample index cbee9fa85..3f37b0e72 100644 --- a/install/local_settings.py.sample +++ b/install/local_settings.py.sample @@ -14,6 +14,8 @@ LOGFILE = "/var/log/django/ishtar-#APP_NAME#.log" MEDIA_ROOT = "#APP_DIR#/media/" +ODT_TEMPLATE = "#INSTALL_PATH#/ishtar/ishtar_common/static/template.odt" + ADMINS = ( # ('Your Name', 'your_email@domain.com'), ) -- cgit v1.2.3 From ffe1e9dc515daa74aa25f9941c3ac87e2724165e Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 1 Jun 2015 23:34:28 +0200 Subject: Fix targetkey formset by allowing only some association --- ishtar_common/forms_common.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index d8740b68c..091d31c1c 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -114,6 +114,8 @@ class TargetKeyForm(forms.ModelForm): self.fields['target'].widget.attrs['readonly'] = True self.fields['key'].widget.attrs['readonly'] = True self.fields['value'].widget.choices = list(instance.target.get_choices()) + self.fields['key'].required = False + self.fields['value'].required = False def clean_target(self): instance = getattr(self, 'instance', None) -- cgit v1.2.3