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:06 UTC
[2/9] git commit: [#5673] ticket:299 Prefixed special fields with __
to avoid conflicts
[#5673] ticket:299 Prefixed special fields with __ to avoid conflicts
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/a01aca47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/a01aca47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/a01aca47
Branch: refs/heads/master
Commit: a01aca47dafbb1dd01b4d2c0e42d5a78fc61f863
Parents: b634733
Author: Aleksey 'LXj' Alekseyev <go...@gmail.com>
Authored: Mon Mar 25 19:57:13 2013 +0200
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Thu Apr 4 08:06:43 2013 +0000
----------------------------------------------------------------------
.../templates/tracker_widgets/mass_edit_form.html | 4 ++--
ForgeTracker/forgetracker/tracker_main.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a01aca47/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 f46f273..7e6e738 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html
@@ -72,6 +72,6 @@
<!-- 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" />
- <input name="search" type="hidden" value="" id="id_search" />
+ <input name="__selected" type="hidden" value="" id="id_selected" />
+ <input name="__search" type="hidden" value="" id="id_search" />
</form>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a01aca47/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 58ebab1..4c97aa8 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -737,7 +737,7 @@ class RootController(BaseController):
@require_post()
def update_tickets(self, **post_data):
tickets = TM.Ticket.query.find(dict(
- _id={'$in':[ObjectId(id) for id in post_data['selected'].split(',')]},
+ _id={'$in':[ObjectId(id) for id in post_data['__selected'].split(',')]},
app_config_id=c.app.config._id)).all()
for ticket in tickets:
require_access(ticket, 'update')
@@ -789,7 +789,7 @@ class RootController(BaseController):
ticket.commit()
c.app.globals.invalidate_bin_counts()
ThreadLocalORMSession.flush_all()
- redirect('edit/' + post_data['search'])
+ redirect('edit/' + post_data['__search'])
# tickets
# open tickets