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 2012/10/11 17:43:51 UTC
[2/2] git commit: [#5070] revert prior commits since they are causing
forgeblog.tests.functional.test_root.TestRootController.test_related_artifacts
to fail
[#5070] revert prior commits since they are causing forgeblog.tests.functional.test_root.TestRootController.test_related_artifacts to fail
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/a7e8be94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/a7e8be94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/a7e8be94
Branch: refs/heads/db/5105
Commit: a7e8be94cfc3206b46fe35640c1508b830978072
Parents: 5d253a0
Author: Dave Brondsema <db...@geek.net>
Authored: Thu Oct 11 11:07:30 2012 -0400
Committer: Dave Brondsema <db...@geek.net>
Committed: Thu Oct 11 11:07:30 2012 -0400
----------------------------------------------------------------------
Allura/allura/model/artifact.py | 1 -
ForgeTracker/forgetracker/model/ticket.py | 3 +--
ForgeTracker/forgetracker/widgets/ticket_search.py | 2 --
3 files changed, 1 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a7e8be94/Allura/allura/model/artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/artifact.py b/Allura/allura/model/artifact.py
index 725da86..197ed86 100644
--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -217,7 +217,6 @@ class Artifact(MappedClass):
project = self.project
return dict(
id=self.index_id(),
- created_dt=getattr(self._id, 'generation_time', None),
mod_date_dt=self.mod_date,
title_s='Artifact %s' % self._id,
project_id_s=str(project._id),
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a7e8be94/ForgeTracker/forgetracker/model/ticket.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index b89a537..b65d0f8 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -289,8 +289,7 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
votes_up_i=self.votes_up,
votes_down_i=self.votes_down,
votes_total_i=(self.votes_up-self.votes_down),
- import_id_s=ImportIdConverter.get().simplify(self.import_id),
- created_dt=self.created_date,
+ import_id_s=ImportIdConverter.get().simplify(self.import_id)
)
for k,v in self.custom_fields.iteritems():
result[k + '_s'] = unicode(v)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a7e8be94/ForgeTracker/forgetracker/widgets/ticket_search.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/widgets/ticket_search.py b/ForgeTracker/forgetracker/widgets/ticket_search.py
index fc7e3d7..a0de204 100644
--- a/ForgeTracker/forgetracker/widgets/ticket_search.py
+++ b/ForgeTracker/forgetracker/widgets/ticket_search.py
@@ -79,7 +79,6 @@ class SearchHelp(ffw.Lightbox):
<li>Labels assigned to the ticket - labels</li>
<li>Milestone the ticket is assigned to - _milestone</li>
<li>Last modified date - mod_date_dt</li>
-<li>Created date - created_dt</li>
<li>Body of the ticket - text</li>
<li>Number of ticket - ticket_num</li>
<li>User who created the ticket - reported_by</li>
@@ -109,7 +108,6 @@ class SearchHelp(ffw.Lightbox):
<li>Labels assigned to the ticket - labels_s</li>
<li>Milestone the ticket is assigned to - _milestone_s</li>
<li>Last modified date - mod_date_dt</li>
-<li>Created date - created_dt</li>
<li>Body of the ticket - text_s</li>
<li>Number of ticket - ticket_num_i</li>
<li>User who created the ticket - reported_by_s</li>