altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

New abandon event description, renamed some buttons

Browse source 
- Legacy-Id: 3439
This commit is contained in:
Martin Qvist 2011-09-23 10:02:59 +00:00
parent a1a3949a4d
commit bd9b28dfd5
4 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/templates/wgcharter/by_area.html
View file

@ -9,7 +9,7 @@ Copyright The IETF Trust 2011, All Rights Reserved
<h1>Working Groups for {{ area_name }}</h1>
<p>
<span id="create_wg" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child"><a href="/wgcharter/create/">Create WG</a></span></span>
<span id="create_wg" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child"><a href="/wgcharter/create/">Start new WG charter effort</a></span></span>
</p>
{% if not recs %}

2
ietf/templates/wgcharter/in_process.html
View file

@ -9,7 +9,7 @@ Copyright The IETF Trust 2011, All Rights Reserved
<h1>Working Groups in IESG process</h1>
<p>
<span id="create_wg" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child"><a href="/wgcharter/create/">Create WG</a></span></span>
<span id="create_wg" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child"><a href="/wgcharter/create/">Start new WG charter effort</a></span></span>
</p>
{% if not recs %}

14
ietf/wgcharter/views_edit.py
View file

@ -97,7 +97,19 @@ def change_state(request, name, option=None):
charter.charter_state = charter_state
charter.rev = charter_rev
e = log_state_changed(request, charter, login, prev, comment)
if option != "abandon":
e = log_state_changed(request, charter, login, prev, comment)
else:
# Special log for abandoned efforts
e = DocEvent(doc=charter, by=login)
e.type = "changed_document"
e.desc = u"IESG has abandoned the chartering effort and reverted to the previously approved charter"
if comment:
e.desc += "<br>%s" % comment
e.save()
charter.time = datetime.now()
charter.save()
else:

7
static/js/wg-change-state.js
View file

@ -1,4 +1,5 @@
jQuery(document).ready(function () {
function setMessageDraft(state) {
if (jQuery("#id_state").val() == "conclude") {
jQuery("#id_message").val("");
@ -19,6 +20,10 @@ jQuery(document).ready(function () {
setMessageDraft(jQuery("#id_charter_state").val());
});
jQuery("#id_charter_state").click();
var prev_mesg = jQuery("#id_message").val();
if (prev_mesg == "") {
jQuery("#id_charter_state").click();
}
});