From bd9b28dfd5ad3af1c62feca8b9bfb99823a7653b Mon Sep 17 00:00:00 2001
From: Martin Qvist <tin@laenke.io>
Date: Fri, 23 Sep 2011 10:02:59 +0000
Subject: [PATCH] New abandon event description, renamed some buttons  -
 Legacy-Id: 3439

---
 ietf/templates/wgcharter/by_area.html    |  2 +-
 ietf/templates/wgcharter/in_process.html |  2 +-
 ietf/wgcharter/views_edit.py             | 14 +++++++++++++-
 static/js/wg-change-state.js             |  7 ++++++-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/ietf/templates/wgcharter/by_area.html b/ietf/templates/wgcharter/by_area.html
index 3b7cafe9c..3f7d3c0ad 100644
--- a/ietf/templates/wgcharter/by_area.html
+++ b/ietf/templates/wgcharter/by_area.html
@@ -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 %}
diff --git a/ietf/templates/wgcharter/in_process.html b/ietf/templates/wgcharter/in_process.html
index bf933be63..e0b628bbc 100644
--- a/ietf/templates/wgcharter/in_process.html
+++ b/ietf/templates/wgcharter/in_process.html
@@ -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 %}
diff --git a/ietf/wgcharter/views_edit.py b/ietf/wgcharter/views_edit.py
index c11745dcc..7a78181ff 100644
--- a/ietf/wgcharter/views_edit.py
+++ b/ietf/wgcharter/views_edit.py
@@ -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:
diff --git a/static/js/wg-change-state.js b/static/js/wg-change-state.js
index 6e4035582..ccc02f908 100644
--- a/static/js/wg-change-state.js
+++ b/static/js/wg-change-state.js
@@ -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();
+    }
     
 });