You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/08/21 17:27:05 UTC
[23/50] git commit: [#3153] ticket:389 added saved search bins to
tracker bulk_export
[#3153] ticket:389 added saved search bins to tracker bulk_export
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/0a98936f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/0a98936f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/0a98936f
Branch: refs/heads/db/3154b
Commit: 0a98936fca299fac567167ec4ea3f9a68528fa67
Parents: a7fe240
Author: Anton Kasyanov <mi...@gmail.com>
Authored: Tue Jul 23 20:46:36 2013 +0300
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Aug 21 15:25:56 2013 +0000
----------------------------------------------------------------------
ForgeTracker/forgetracker/model/ticket.py | 8 ++++++++
ForgeTracker/forgetracker/tests/test_app.py | 3 +++
ForgeTracker/forgetracker/tracker_main.py | 3 +++
3 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/0a98936f/ForgeTracker/forgetracker/model/ticket.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index 80ce102..0536f71 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -512,6 +512,14 @@ class Bin(Artifact, ActivityObject):
terms_s=self.terms)
return result
+ def __json__(self):
+ return dict(super(Bin,self).__json__(),
+ _id=self._id,
+ summary=self.summary,
+ terms=self.terms,
+ sort=self.sort,
+ )
+
class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
class __mongometa__:
name = 'ticket'
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/0a98936f/ForgeTracker/forgetracker/tests/test_app.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/test_app.py b/ForgeTracker/forgetracker/tests/test_app.py
index a718885..c84fa8d 100644
--- a/ForgeTracker/forgetracker/tests/test_app.py
+++ b/ForgeTracker/forgetracker/tests/test_app.py
@@ -63,3 +63,6 @@ class TestBulkExport(TrackerTestController):
milestones = sorted(tracker['milestones'], key=operator.itemgetter('name'))
assert_equal(milestones[0]['name'], '1.0')
assert_equal(milestones[1]['name'], '2.0')
+
+ saved_bins_summaries = [bin['summary'] for bin in tracker['saved_bins']]
+ assert_true('Closed Tickets' in saved_bins_summaries)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/0a98936f/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 02daa5b..15b0085 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -423,6 +423,9 @@ class ForgeTrackerApp(Application):
f.write(', "milestones":')
milestones = self.milestones
json.dump(milestones, f, cls=jsonify.GenericJSON)
+ f.write(', "saved_bins":')
+ bins = self.bins
+ json.dump(bins, f, cls=jsonify.GenericJSON)
f.write('}')
@property