From d3292a84f0f3ca45c2ff3d90bdc534bad8f998d3 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Thu, 16 Sep 2010 10:09:20 +0000 Subject: [PATCH] Merged [2512] from rjsparks@nostrum.com: Fix for ticket #374 (all in base.js) and removal of a vestigial 'save all changes' button from the iesg/agenda/documents page. - Legacy-Id: 2518 Note: SVN reference [2512] has been migrated to Git commit 6d7b72d96d2986e1634cd0c936260d095dec127b --- ietf/templates/iesg/agenda_documents.html | 4 ---- static/js/base.js | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ietf/templates/iesg/agenda_documents.html b/ietf/templates/iesg/agenda_documents.html index a64b7f346..738546b51 100644 --- a/ietf/templates/iesg/agenda_documents.html +++ b/ietf/templates/iesg/agenda_documents.html @@ -128,10 +128,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. {% if t.docs.s333 %}3.3.3 For Action{% endif %} {% for doc in t.docs.s333 %}{% include "iesg/agenda_documents_row.html" %}{%endfor%} -{% if user|in_group:"Secretariat,Area_Director" %} - -{% endif %} - {% endfor %} diff --git a/static/js/base.js b/static/js/base.js index a66100209..a24ac900b 100644 --- a/static/js/base.js +++ b/static/js/base.js @@ -33,7 +33,7 @@ function showBallot(draftName, editPositionUrl) { var handleEditPosition = function() { IETF.ballotDialog.hide(); - window.location = editPositionUrl; + window.location = IETF.editPositionUrl; }; var handleClose = function() { IETF.ballotDialog.hide(); @@ -58,6 +58,7 @@ function showBallot(draftName, editPositionUrl) { IETF.ballotDialog.render(); } document.getElementById("ballot_dialog_name").innerHTML = draftName; + IETF.editPositionUrl = editPositionUrl; IETF.ballotDialog.show();