diff options
| -rwxr-xr-x | install/install.sh | 1 | ||||
| -rw-r--r-- | install/local_settings.py.sample | 2 | ||||
| -rw-r--r-- | ishtar_common/forms_common.py | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/install/install.sh b/install/install.sh index f4ab7f195..9a2ba4094 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'), ) diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index 23d7126c9..664dfb775 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -122,6 +122,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) |