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/02 23:30:28 UTC
[1/34] git commit: [#4968] provide pluggable ticket import_id
converter
Updated Branches:
refs/heads/db/4968 81ce0bb1e -> 0f97ac38d (forced update)
[#4968] provide pluggable ticket import_id converter
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/0f97ac38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/0f97ac38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/0f97ac38
Branch: refs/heads/db/4968
Commit: 0f97ac38df5bcb781e0262abfff9075dd7e8fd37
Parents: 3c95f7c
Author: Dave Brondsema <db...@geek.net>
Authored: Tue Oct 2 19:53:11 2012 +0000
Committer: Dave Brondsema <db...@geek.net>
Committed: Tue Oct 2 19:53:17 2012 +0000
----------------------------------------------------------------------
ForgeTracker/forgetracker/model/ticket.py | 5 +++--
ForgeTracker/forgetracker/tracker_main.py | 5 ++---
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/0f97ac38/ForgeTracker/forgetracker/model/ticket.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index b0a4580..31753ae 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -4,7 +4,6 @@ import json
import difflib
from datetime import datetime, timedelta
-import bson
import pymongo
import pylons
pylons.c = pylons.tmpl_context
@@ -29,6 +28,8 @@ from allura.lib.search import search_artifact
from allura.lib import utils
from allura.lib import helpers as h
+from forgetracker.plugins import ImportIdConverter
+
log = logging.getLogger(__name__)
config = utils.ConfigProxy(
@@ -278,7 +279,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=self.import_id
+ 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/0f97ac38/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 8a6bc42..8210233 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -48,6 +48,7 @@ from forgetracker.widgets.bin_form import BinForm
from forgetracker.widgets.ticket_search import TicketSearchResults, MassEdit, MassEditForm, SearchHelp
from forgetracker.widgets.admin_custom_fields import TrackerFieldAdmin, TrackerFieldDisplay
from forgetracker.import_support import ImportSupport
+from forgetracker.plugins import ImportIdConverter
log = logging.getLogger(__name__)
@@ -301,8 +302,6 @@ class ForgeTrackerApp(Application):
-
-
### Controllers ###
def mongo_columns():
@@ -958,7 +957,7 @@ class TicketController(BaseController):
if self.ticket is None:
self.ticket = TM.Ticket.query.get(
app_config_id=c.app.config._id,
- import_id=str(ticket_num))
+ import_id=str(ImportIdConverter.get().expand(ticket_num, c.app)))
if self.ticket is not None:
utils.permanent_redirect(self.ticket.url())
self.attachment = AttachmentsController(self.ticket)