Merged [7416] from olau@iola.dk: Redo the quickfix to the "Send and Post" button bug (mentioned in

issue #1308) so that we still do the validation correctly, but just
always show the button (even if it's unusable)
 - Legacy-Id: 7599
Note: SVN reference [7416] has been migrated to Git commit 649618626e
This commit is contained in:
Henrik Levkowetz 2014-04-12 18:28:05 +00:00
commit f6cc509fd6
3 changed files with 3 additions and 5 deletions

View file

@ -309,8 +309,6 @@ class IncomingLiaisonForm(LiaisonForm):
self.fields['organization'].choices = self.hm.get_all_incoming_entities()
def get_post_only(self):
# Temporary fix - newer django plumbs when forms are validated differently - fail permissive for now
return False
from_entity = self.get_from_entity()
if is_secretariat(self.user) or Role.objects.filter(person=self.person, group=from_entity.obj, name="auth"):
return False

View file

@ -44,9 +44,7 @@
{% if form.edit %}
<input type="submit" value="Save" name="save" />
{% else %}
{% if not form.get_post_only %}
<input type="submit" value="Send and Post" name="send" />
{% endif %}
<input type="submit" value="Post Only" name="post_only" />
{% endif %}
<div id="cancel-dialog" style="display: none;" title="Cancel {% if form.edit %}editing liaison{% else %}adding new liaison{% endif %}">

View file

@ -7,7 +7,9 @@
# --- Add entries at the top ---
branch/iola/djangoport-fixes@7416
branch/iola/djangoport-fixes@7421
branch/iola/djangoport-fixes@7519
personal/rcross/v5.1.0@7568
personal/rcross/v5.1.0@7549 Fix tests broken in auth change
personal/rcross/v5.1.0@7454