You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2014/03/11 16:41:34 UTC
[1/4] git commit: [#4602] ticket:541 Fix failing tests due to changes
in link_text()
Repository: incubator-allura
Updated Branches:
refs/heads/master e1fc8755c -> 17d9dc8c5
[#4602] ticket:541 Fix failing tests due to changes in link_text()
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/effeaa09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/effeaa09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/effeaa09
Branch: refs/heads/master
Commit: effeaa09d64596c7ce9bccab69b01ef89bdc5857
Parents: 40aa433
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Feb 21 15:17:35 2014 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Tue Mar 11 14:17:19 2014 +0000
----------------------------------------------------------------------
Allura/allura/tests/model/test_artifact.py | 2 +-
Allura/allura/tests/model/test_discussion.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/effeaa09/Allura/allura/tests/model/test_artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_artifact.py b/Allura/allura/tests/model/test_artifact.py
index d00d935..031b105 100644
--- a/Allura/allura/tests/model/test_artifact.py
+++ b/Allura/allura/tests/model/test_artifact.py
@@ -110,7 +110,7 @@ def test_artifact():
assert idx['id'] == pg.index_id()
assert 'text' in idx
assert 'TestPage' in pg.shorthand_id()
- assert pg.link_text() == pg.shorthand_id()
+ assert pg.link_text() == '%s: %s' % (pg.type_s, pg.shorthand_id())
@with_setup(setUp, tearDown)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/effeaa09/Allura/allura/tests/model/test_discussion.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_discussion.py b/Allura/allura/tests/model/test_discussion.py
index f814fad..6f6d86e 100644
--- a/Allura/allura/tests/model/test_discussion.py
+++ b/Allura/allura/tests/model/test_discussion.py
@@ -155,7 +155,7 @@ def test_post_methods():
assert_equals(p.attachments, [])
assert 'wiki/_discuss' in p.url()
assert p.reply_subject() == 'Re: Test Thread'
- assert p.link_text() == p.subject
+ assert p.link_text() == '%s: %s' % (p.type_s, p.subject)
ss = p.history().first()
assert 'version' in h.get_first(ss.index(), 'title')
[2/4] git commit: [#4602] ticket:541 Add strikethrough to artifact
links
Posted by tv...@apache.org.
[#4602] ticket:541 Add strikethrough to artifact links
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/40aa4332
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/40aa4332
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/40aa4332
Branch: refs/heads/master
Commit: 40aa43320e6303a27396bd4d0e4f886eb8c5d55d
Parents: 7999221
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Feb 21 13:46:24 2014 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Tue Mar 11 14:17:19 2014 +0000
----------------------------------------------------------------------
Allura/allura/lib/markdown_extensions.py | 2 ++
Allura/allura/nf/allura/css/site_style.css | 1 +
ForgeTracker/forgetracker/tests/functional/test_root.py | 3 +++
3 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/40aa4332/Allura/allura/lib/markdown_extensions.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/markdown_extensions.py b/Allura/allura/lib/markdown_extensions.py
index 60bf943..ebfc4bf 100644
--- a/Allura/allura/lib/markdown_extensions.py
+++ b/Allura/allura/lib/markdown_extensions.py
@@ -335,6 +335,8 @@ class ForgeLinkPattern(markdown.inlinepatterns.LinkPattern):
shortlink = M.Shortlink.lookup(link)
if shortlink and not getattr(shortlink.ref.artifact, 'deleted', False):
href = shortlink.url
+ if getattr(shortlink.ref.artifact, 'is_closed', False):
+ classes += ' strikethrough'
self.ext.forge_link_tree_processor.alinks.append(shortlink)
elif is_link_with_brackets:
href = h.urlquote(link)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/40aa4332/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index a82fa4a..ee8959b 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -3490,3 +3490,4 @@ ul.dropdown ul li a:hover {
#user-message {
top: 10px;
}
+.strikethrough { text-decoration: line-through; }
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/40aa4332/ForgeTracker/forgetracker/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index 59c878d..f04e1c8 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -891,6 +891,9 @@ class TestFunctionalController(TrackerTestController):
assert_not_in('<s>Ticket: #1</s>', r)
assert_in('<s>Ticket: #2</s>', r)
+ assert_in('<a class="alink" href="/p/test/bugs/1/">[#1]</a>', r)
+ assert_in('<a class="alink strikethrough" href="/p/test/bugs/2/">[#2]</a>', r)
+
def test_ticket_view_editable(self):
summary = 'test ticket view page can be edited'
self.new_ticket(summary=summary)
[4/4] git commit: [#4602] Undo link_text changes
Posted by tv...@apache.org.
[#4602] Undo link_text changes
- Undo these changes since we have changed the way we generate
the Related Artifact link text in the meantime.
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/17d9dc8c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/17d9dc8c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/17d9dc8c
Branch: refs/heads/master
Commit: 17d9dc8c5128947112183e2b59a798f3e4232d50
Parents: effeaa0
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Tue Mar 11 15:40:46 2014 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Tue Mar 11 15:40:46 2014 +0000
----------------------------------------------------------------------
Allura/allura/model/artifact.py | 2 +-
Allura/allura/model/discuss.py | 2 +-
Allura/allura/model/repo.py | 2 +-
Allura/allura/tests/model/test_artifact.py | 2 +-
Allura/allura/tests/model/test_discussion.py | 2 +-
ForgeTracker/forgetracker/tests/functional/test_root.py | 8 ++++----
6 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/17d9dc8c/Allura/allura/model/artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/artifact.py b/Allura/allura/model/artifact.py
index d819897..2f62ca4 100644
--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -368,7 +368,7 @@ class Artifact(MappedClass):
override this method to provide more descriptive link text.
"""
- return '%s: %s' % (self.type_s, self.shorthand_id())
+ return self.shorthand_id()
def get_discussion_thread(self, data=None):
"""Return the discussion thread and parent_id for this artifact.
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/17d9dc8c/Allura/allura/model/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py
index 4a9c6ef..b9f25d1 100644
--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -648,7 +648,7 @@ class Post(Message, VersionedArtifact, ActivityObject):
return None
def link_text(self):
- return '%s: %s' % (self.type_s, self.subject)
+ return self.subject
def reply_subject(self):
if self.subject and self.subject.lower().startswith('re:'):
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/17d9dc8c/Allura/allura/model/repo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repo.py b/Allura/allura/model/repo.py
index 29e04c1..81d843d 100644
--- a/Allura/allura/model/repo.py
+++ b/Allura/allura/model/repo.py
@@ -295,7 +295,7 @@ class Commit(RepoObject, ActivityObject):
By default this method returns type_s + shorthand_id(). Subclasses should
override this method to provide more descriptive link text.
'''
- return '%s: %s' % (self.type_s, self.shorthand_id())
+ return self.shorthand_id()
def context(self):
result = dict(prev=None, next=None)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/17d9dc8c/Allura/allura/tests/model/test_artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_artifact.py b/Allura/allura/tests/model/test_artifact.py
index 031b105..d00d935 100644
--- a/Allura/allura/tests/model/test_artifact.py
+++ b/Allura/allura/tests/model/test_artifact.py
@@ -110,7 +110,7 @@ def test_artifact():
assert idx['id'] == pg.index_id()
assert 'text' in idx
assert 'TestPage' in pg.shorthand_id()
- assert pg.link_text() == '%s: %s' % (pg.type_s, pg.shorthand_id())
+ assert pg.link_text() == pg.shorthand_id()
@with_setup(setUp, tearDown)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/17d9dc8c/Allura/allura/tests/model/test_discussion.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_discussion.py b/Allura/allura/tests/model/test_discussion.py
index 6f6d86e..f814fad 100644
--- a/Allura/allura/tests/model/test_discussion.py
+++ b/Allura/allura/tests/model/test_discussion.py
@@ -155,7 +155,7 @@ def test_post_methods():
assert_equals(p.attachments, [])
assert 'wiki/_discuss' in p.url()
assert p.reply_subject() == 'Re: Test Thread'
- assert p.link_text() == '%s: %s' % (p.type_s, p.subject)
+ assert p.link_text() == p.subject
ss = p.history().first()
assert 'version' in h.get_first(ss.index(), 'title')
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/17d9dc8c/ForgeTracker/forgetracker/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index f04e1c8..00ea90d 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -875,7 +875,7 @@ class TestFunctionalController(TrackerTestController):
M.MonQTask.run_ready()
ThreadLocalORMSession.flush_all()
response = self.app.get('/p/test/bugs/1/')
- assert 'Ticket: #2' not in response
+ assert 'Tickets: #2' not in response
response = self.app.get('/wiki/aaa/')
assert 'alink notfound' in response
@@ -887,9 +887,9 @@ class TestFunctionalController(TrackerTestController):
M.MonQTask.run_ready()
ThreadLocalORMSession.flush_all()
r = self.app.get('/p/test/bugs/3/')
- assert_in('Ticket: #1', r)
- assert_not_in('<s>Ticket: #1</s>', r)
- assert_in('<s>Ticket: #2</s>', r)
+ assert_in('Tickets: #1', r)
+ assert_not_in('Tickets: <s>#1</s>', r)
+ assert_in('Tickets: <s>#2</s>', r)
assert_in('<a class="alink" href="/p/test/bugs/1/">[#1]</a>', r)
assert_in('<a class="alink strikethrough" href="/p/test/bugs/2/">[#2]</a>', r)
[3/4] git commit: [#4602] ticket:541 Add strikethrough to 'Related'
section
Posted by tv...@apache.org.
[#4602] ticket:541 Add strikethrough to 'Related' section
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/79992213
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/79992213
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/79992213
Branch: refs/heads/master
Commit: 7999221357c04952b496279f9a6529923315388e
Parents: e1fc875
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Feb 21 13:19:47 2014 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Tue Mar 11 14:17:19 2014 +0000
----------------------------------------------------------------------
Allura/allura/model/artifact.py | 4 ++--
Allura/allura/model/discuss.py | 2 +-
Allura/allura/model/repo.py | 4 ++--
ForgeTracker/forgetracker/model/ticket.py | 12 +++++++++++-
ForgeTracker/forgetracker/tests/functional/test_root.py | 12 ++++++++++++
5 files changed, 28 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/79992213/Allura/allura/model/artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/artifact.py b/Allura/allura/model/artifact.py
index cd8f5e2..d819897 100644
--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -364,11 +364,11 @@ class Artifact(MappedClass):
"""Return the link text to use when a shortlink to this artifact
is expanded into an <a></a> tag.
- By default this method returns :meth:`shorthand_id`. Subclasses should
+ By default this method returns :attr:`type_s` + :meth:`shorthand_id`. Subclasses should
override this method to provide more descriptive link text.
"""
- return self.shorthand_id()
+ return '%s: %s' % (self.type_s, self.shorthand_id())
def get_discussion_thread(self, data=None):
"""Return the discussion thread and parent_id for this artifact.
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/79992213/Allura/allura/model/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py
index b9f25d1..4a9c6ef 100644
--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -648,7 +648,7 @@ class Post(Message, VersionedArtifact, ActivityObject):
return None
def link_text(self):
- return self.subject
+ return '%s: %s' % (self.type_s, self.subject)
def reply_subject(self):
if self.subject and self.subject.lower().startswith('re:'):
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/79992213/Allura/allura/model/repo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repo.py b/Allura/allura/model/repo.py
index 9f11cc8..29e04c1 100644
--- a/Allura/allura/model/repo.py
+++ b/Allura/allura/model/repo.py
@@ -292,10 +292,10 @@ class Commit(RepoObject, ActivityObject):
'''The link text that will be used when a shortlink to this artifact
is expanded into an <a></a> tag.
- By default this method returns shorthand_id(). Subclasses should
+ By default this method returns type_s + shorthand_id(). Subclasses should
override this method to provide more descriptive link text.
'''
- return self.shorthand_id()
+ return '%s: %s' % (self.type_s, self.shorthand_id())
def context(self):
result = dict(prev=None, next=None)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/79992213/ForgeTracker/forgetracker/model/ticket.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index ecba850..b308416 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -621,6 +621,12 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
reported_by = RelationProperty(User, via='reported_by_id')
+ def link_text(self):
+ text = super(Ticket, self).link_text()
+ if self.is_closed:
+ return jinja2.Markup('<s>') + text + jinja2.Markup('</s>')
+ return text
+
@property
def activity_name(self):
return 'ticket #%s' % self.ticket_num
@@ -755,7 +761,11 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
@property
def open_or_closed(self):
- return 'closed' if self.status in c.app.globals.set_of_closed_status_names else 'open'
+ return 'closed' if self.status in self.app.globals.set_of_closed_status_names else 'open'
+
+ @property
+ def is_closed(self):
+ return self.open_or_closed == 'closed'
@property
def monitoring_email(self):
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/79992213/ForgeTracker/forgetracker/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index 9642c38..59c878d 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -879,6 +879,18 @@ class TestFunctionalController(TrackerTestController):
response = self.app.get('/wiki/aaa/')
assert 'alink notfound' in response
+ def test_related_artifacts_closed_tickets(self):
+ self.new_ticket(summary='Ticket 1')
+ self.new_ticket(summary='Ticket 2', status='closed')
+ self.new_ticket(summary='Ticket 3', description='[#1]\n\n[#2]')
+ ThreadLocalORMSession.flush_all()
+ M.MonQTask.run_ready()
+ ThreadLocalORMSession.flush_all()
+ r = self.app.get('/p/test/bugs/3/')
+ assert_in('Ticket: #1', r)
+ assert_not_in('<s>Ticket: #1</s>', r)
+ assert_in('<s>Ticket: #2</s>', r)
+
def test_ticket_view_editable(self):
summary = 'test ticket view page can be edited'
self.new_ticket(summary=summary)