You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/04/04 18:38:08 UTC

[4/9] git commit: [#5673] ticket:299 Changed bulk edit to do regular submit instead of AJAX

[#5673] ticket:299 Changed bulk edit to do regular submit instead of AJAX


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/16a253ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/16a253ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/16a253ca

Branch: refs/heads/master
Commit: 16a253caf4fa387a83dd0aae7beb49d06b918253
Parents: 4c3419a
Author: Aleksey 'LXj' Alekseyev <go...@gmail.com>
Authored: Mon Mar 25 19:35:12 2013 +0200
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Thu Apr 4 08:06:43 2013 +0000

----------------------------------------------------------------------
 .../templates/tracker_widgets/mass_edit_form.html  |    5 +++--
 ForgeTracker/forgetracker/tracker_main.py          |    1 +
 .../forgetracker/widgets/resources/js/mass-edit.js |   15 +++------------
 3 files changed, 7 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/16a253ca/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html b/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html
index d7c298e..0784d19 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html
@@ -1,4 +1,4 @@
-<form id="update-values" method="post">
+<form id="update-values" method="post" action="../update_tickets">
     {% for field in globals.custom_fields %}
       {% if field.name == '_milestone' %}
       <div class="grid-6">{{milestones}}
@@ -67,9 +67,10 @@
       {% endif %}
     {% endfor %}
     <div class="grid-18">
-      <input type="button" class="update_tickets" value="Save"/>
+      <input type="submit" class="update_tickets" value="Save"/>
       <a href="{{cancel_href}}" class="btn link">Cancel</a>
       <!-- tg.url(c.app.url+'search/', dict(q=query, limit=limit, sort=sort))}}" class="btn link">Cancel</a>-->
     </div>
     <div class="grid-12" id="result"></div>
+    <input name="selected" type="hidden" value="" id="id_selected" />
 </form>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/16a253ca/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 02910d1..6c39e68 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -789,6 +789,7 @@ class RootController(BaseController):
                 ticket.commit()
         c.app.globals.invalidate_bin_counts()
         ThreadLocalORMSession.flush_all()
+        redirect('edit')
 
 # tickets
 # open tickets

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/16a253ca/ForgeTracker/forgetracker/widgets/resources/js/mass-edit.js
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/widgets/resources/js/mass-edit.js b/ForgeTracker/forgetracker/widgets/resources/js/mass-edit.js
index a8d91d0..b75bdf1 100644
--- a/ForgeTracker/forgetracker/widgets/resources/js/mass-edit.js
+++ b/ForgeTracker/forgetracker/widgets/resources/js/mass-edit.js
@@ -8,23 +8,14 @@ $(function(){
             $('tbody.ticket-list input[type=checkbox]').removeAttr('checked');
         }
     });
-    $('input.update_tickets').click(function(){
+    $('#update-values').submit(function(){
         var $checked=$('tbody.ticket-list input:checked'), count=$checked.length;
 
         if ( !count ) {
             $('#result').text('No tickets selected for update.');
-            return;
+            return false;
         }
 
-        var data={};
-        data.selected = $checked.map(function(){ return this.name; }).get().join(',');
-        $('#update-values').find('input, select').each(function(){
-            this.value && (data[this.name]=this.value);
-        });
-
-        $.post('../update_tickets', data, function(){
-            flash('Updated '+count+' ticket'+(count!=1 ? 's' : ''))
-            location.reload();
-        });
+        $('#id_selected').val($checked.map(function(){ return this.name; }).get().join(','));
     });
 });