Skip to content

Commit f6cc509

Browse files
committed
Merged [7416] from olau@iola.dk: Redo the quickfix to the "Send and Post" button bug (mentioned in
issue ietf-tools#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 6496186
2 parents e9fa1d6 + 6496186 commit f6cc509

3 files changed

Lines changed: 3 additions & 5 deletions

File tree

ietf/liaisons/forms.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,6 @@ def set_organization_field(self):
309309
self.fields['organization'].choices = self.hm.get_all_incoming_entities()
310310

311311
def get_post_only(self):
312-
# Temporary fix - newer django plumbs when forms are validated differently - fail permissive for now
313-
return False
314312
from_entity = self.get_from_entity()
315313
if is_secretariat(self.user) or Role.objects.filter(person=self.person, group=from_entity.obj, name="auth"):
316314
return False

ietf/templates/liaisons/liaisonform.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ <h2>{{ fieldset.name }}</h2>
4444
{% if form.edit %}
4545
<input type="submit" value="Save" name="save" />
4646
{% else %}
47-
{% if not form.get_post_only %}
4847
<input type="submit" value="Send and Post" name="send" />
49-
{% endif %}
5048
<input type="submit" value="Post Only" name="post_only" />
5149
{% endif %}
5250
<div id="cancel-dialog" style="display: none;" title="Cancel {% if form.edit %}editing liaison{% else %}adding new liaison{% endif %}">

ready-for-merge

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77

88
# --- Add entries at the top ---
99

10-
10+
branch/iola/djangoport-fixes@7416
11+
branch/iola/djangoport-fixes@7421
12+
branch/iola/djangoport-fixes@7519
1113
personal/rcross/v5.1.0@7568
1214
personal/rcross/v5.1.0@7549 Fix tests broken in auth change
1315
personal/rcross/v5.1.0@7454

0 commit comments

Comments
 (0)