diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-01-04 16:20:11 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-01-11 17:30:46 +0100 |
| commit | 5c110f503d9dc6ef956b1f12d2220be9cd528fb1 (patch) | |
| tree | 4724ae36d28c7e7dd492afaaca9442102861f1e8 /ishtar_common/forms_common.py | |
| parent | 724f505a8f7e3fef417ea204cb39bc54d042cf50 (diff) | |
| download | Ishtar-5c110f503d9dc6ef956b1f12d2220be9cd528fb1.tar.bz2 Ishtar-5c110f503d9dc6ef956b1f12d2220be9cd528fb1.zip | |
Sheet: only display window link when permissions are OK
Diffstat (limited to 'ishtar_common/forms_common.py')
| -rw-r--r-- | ishtar_common/forms_common.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index 1cbaecb92..b461d6266 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -40,7 +40,7 @@ from django.utils.translation import ugettext_lazy as _, pgettext import models import widgets from bootstrap_datepicker.widgets import DatePicker -from ishtar_common.templatetags.link_to_window import link_to_window +from ishtar_common.templatetags.link_to_window import simple_link_to_window from forms import FinalForm, FormSet, reverse_lazy, name_validator, \ TableSelect, ManageOldType, CustomForm, FieldType, FormHeader, \ FormSetWithDeleteSwitches, IshtarForm, get_data_from_formset @@ -414,7 +414,7 @@ class MergeIntoForm(forms.Form): except self.associated_model.DoesNotExist: continue self.fields['main_item'].choices.append( - (item.pk, mark_safe(u"{} {}".format(link_to_window(item), + (item.pk, mark_safe(u"{} {}".format(simple_link_to_window(item), unicode(item))))) def merge(self): |