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 2014/09/16 17:44:30 UTC
[1/5] git commit: [#4905] ticket:634 added new subscribe menu for all
wiki pages
Repository: allura
Updated Branches:
refs/heads/master fab7d22e4 -> ef66cbbdd
[#4905] ticket:634 added new subscribe menu for all wiki pages
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/36996286
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/36996286
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/36996286
Branch: refs/heads/master
Commit: 369962867b663fc17799c42381231c5851d95751
Parents: fab7d22
Author: discort <le...@bk.ru>
Authored: Fri Aug 22 00:44:41 2014 +0300
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Sep 16 15:33:35 2014 +0000
----------------------------------------------------------------------
.../forgewiki/templates/wiki/page_view.html | 3 ++-
ForgeWiki/forgewiki/wiki_main.py | 20 +++++++++++++++++++-
2 files changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/36996286/ForgeWiki/forgewiki/templates/wiki/page_view.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_view.html b/ForgeWiki/forgewiki/templates/wiki/page_view.html
index c076f57..61407c4 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_view.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_view.html
@@ -62,7 +62,8 @@
{% endif %}
{% if c.user and c.user != c.user.anonymous() %}
- {{c.subscribe_form.display(value=subscribed, action='subscribe', style='icon')}}
+ {{c.subscribe_form.display(value=page_subscribed, tool_subscribed=tool_subscribed, action='subscribe', style='icon')}}
+ {{c.wiki_subscribe_form.display(value=subscribed, action='wiki_subscribe', style='icon')}}
{% endif %}
<a href="feed" title="RSS"><b data-icon="{{g.icons['feed'].char}}" class="ico {{g.icons['feed'].css}}" title="Feed"></b></a>
<a href="../search" title="Search"><b data-icon="{{g.icons['search'].char}}" class="ico {{g.icons['search'].css}}" title="Search"></b></a>
http://git-wip-us.apache.org/repos/asf/allura/blob/36996286/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index 8c46f00..c6abf88 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -69,6 +69,7 @@ class W:
attachment_list = ffw.AttachmentList()
subscribe_form = SubscribeForm()
page_subscribe_form = SubscribeForm(thing='page')
+ wiki_subscribe_form = SubscribeForm(thing='wiki')
page_list = ffw.PageList()
page_size = ffw.PageSize()
search_results = SearchResults()
@@ -494,6 +495,7 @@ class PageController(BaseController, FeedController):
c.thread = W.thread
c.attachment_list = W.attachment_list
c.subscribe_form = W.page_subscribe_form
+ c.wiki_subscribe_form = W.wiki_subscribe_form
post_count = self.page.discussion_thread.post_count
limit, pagenum = h.paging_sanitizer(limit, page, post_count)
page = self.get_version(version)
@@ -511,10 +513,17 @@ class PageController(BaseController, FeedController):
prev = None
next = cur + 1
hide_left_bar = not (c.app.show_left_bar)
+ tool_subscribed = M.Mailbox.subscribed()
+ if tool_subscribed:
+ subscribed = False
+ else:
+ subscribed = M.Mailbox.subscribed(artifact=self.page)
return dict(
page=page,
cur=cur, prev=prev, next=next,
- subscribed=M.Mailbox.subscribed(artifact=self.page),
+ tool_subscribed=tool_subscribed,
+ page_subscribed=subscribed,
+ subscribed=M.Mailbox.subscribed(),
hide_left_bar=hide_left_bar, show_meta=c.app.show_right_bar,
pagenum=pagenum, limit=limit, count=post_count)
@@ -701,6 +710,15 @@ class PageController(BaseController, FeedController):
self.page.unsubscribe()
redirect(request.referer)
+ @expose()
+ @validate(W.subscribe_form)
+ def wiki_subscribe(self, subscribe=None, unsubscribe=None):
+ if subscribe:
+ M.Mailbox.subscribe(type='direct')
+ elif unsubscribe:
+ M.Mailbox.unsubscribe()
+ redirect(request.referer)
+
class WikiAttachmentController(ac.AttachmentController):
AttachmentClass = WM.WikiAttachment
[5/5] git commit: [#4905] ticket:634 removed unused pieces of code
Posted by br...@apache.org.
[#4905] ticket:634 removed unused pieces of code
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/263b6d43
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/263b6d43
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/263b6d43
Branch: refs/heads/master
Commit: 263b6d43bb9c2c802af6286da64ac41389184889
Parents: 3699628
Author: discort <le...@bk.ru>
Authored: Mon Aug 25 16:31:28 2014 +0300
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Sep 16 15:33:36 2014 +0000
----------------------------------------------------------------------
ForgeWiki/forgewiki/templates/wiki/page_view.html | 2 +-
ForgeWiki/forgewiki/wiki_main.py | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/263b6d43/ForgeWiki/forgewiki/templates/wiki/page_view.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_view.html b/ForgeWiki/forgewiki/templates/wiki/page_view.html
index 61407c4..4e19b2f 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_view.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_view.html
@@ -62,7 +62,7 @@
{% endif %}
{% if c.user and c.user != c.user.anonymous() %}
- {{c.subscribe_form.display(value=page_subscribed, tool_subscribed=tool_subscribed, action='subscribe', style='icon')}}
+ {{c.subscribe_form.display(value=page_subscribed, action='subscribe', style='icon')}}
{{c.wiki_subscribe_form.display(value=subscribed, action='wiki_subscribe', style='icon')}}
{% endif %}
<a href="feed" title="RSS"><b data-icon="{{g.icons['feed'].char}}" class="ico {{g.icons['feed'].css}}" title="Feed"></b></a>
http://git-wip-us.apache.org/repos/asf/allura/blob/263b6d43/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index c6abf88..615af76 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -521,7 +521,6 @@ class PageController(BaseController, FeedController):
return dict(
page=page,
cur=cur, prev=prev, next=next,
- tool_subscribed=tool_subscribed,
page_subscribed=subscribed,
subscribed=M.Mailbox.subscribed(),
hide_left_bar=hide_left_bar, show_meta=c.app.show_right_bar,
[3/5] git commit: [#4905] ticket:655 Move 'subscribe to wiki' button
to sidebar
Posted by br...@apache.org.
[#4905] ticket:655 Move 'subscribe to wiki' button to sidebar
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/a39bce78
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/a39bce78
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/a39bce78
Branch: refs/heads/master
Commit: a39bce7864527401cd109902e85e20cb90c7f8dc
Parents: 6b9a52c
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Sep 12 09:53:05 2014 +0300
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Sep 16 15:33:36 2014 +0000
----------------------------------------------------------------------
.../forgewiki/templates/wiki/page_view.html | 1 -
ForgeWiki/forgewiki/wiki_main.py | 34 +++++++++++---------
2 files changed, 18 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/a39bce78/ForgeWiki/forgewiki/templates/wiki/page_view.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_view.html b/ForgeWiki/forgewiki/templates/wiki/page_view.html
index 4e19b2f..2f4d95f 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_view.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_view.html
@@ -63,7 +63,6 @@
{% endif %}
{% if c.user and c.user != c.user.anonymous() %}
{{c.subscribe_form.display(value=page_subscribed, action='subscribe', style='icon')}}
- {{c.wiki_subscribe_form.display(value=subscribed, action='wiki_subscribe', style='icon')}}
{% endif %}
<a href="feed" title="RSS"><b data-icon="{{g.icons['feed'].char}}" class="ico {{g.icons['feed'].css}}" title="Feed"></b></a>
<a href="../search" title="Search"><b data-icon="{{g.icons['search'].char}}" class="ico {{g.icons['search'].css}}" title="Search"></b></a>
http://git-wip-us.apache.org/repos/asf/allura/blob/a39bce78/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index 41f056e..f0169a4 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -69,7 +69,6 @@ class W:
attachment_list = ffw.AttachmentList()
subscribe_form = SubscribeForm()
page_subscribe_form = SubscribeForm(thing='page')
- wiki_subscribe_form = SubscribeForm(thing='wiki')
page_list = ffw.PageList()
page_size = ffw.PageSize()
search_results = SearchResults()
@@ -228,6 +227,14 @@ The wiki uses [Markdown](%s) syntax.
SitemapEntry(
'Moderate', discussion.url() + 'moderate', ui_icon=g.icons['pencil'],
small=pending_mod_count))
+ subscribed = M.Mailbox.subscribed()
+ subscribe_action = 'unsubscribe' if subscribed else 'subscribe'
+ subscribe_title = '{}{}'.format(
+ subscribe_action.capitalize(),
+ '' if subscribed else ' to wiki')
+ subscribe_url = '{}subscribe?{}=True'.format(self.url, subscribe_action)
+ links += [SitemapEntry(''),
+ SitemapEntry(subscribe_title, subscribe_url, ui_icon=g.icons['mail'])]
if not admin_menu:
links += [SitemapEntry(''),
SitemapEntry('Formatting Help', self.url + 'markdown_syntax/')]
@@ -439,6 +446,15 @@ class RootController(BaseController, DispatchIndex, FeedController):
'Display a page about how to use markdown.'
return dict(example=MARKDOWN_EXAMPLE)
+ @expose()
+ @validate(W.subscribe_form)
+ def subscribe(self, subscribe=None, unsubscribe=None):
+ if subscribe:
+ M.Mailbox.subscribe(type='direct')
+ elif unsubscribe:
+ M.Mailbox.unsubscribe()
+ redirect(request.referer)
+
class PageController(BaseController, FeedController):
@@ -495,7 +511,6 @@ class PageController(BaseController, FeedController):
c.thread = W.thread
c.attachment_list = W.attachment_list
c.subscribe_form = W.page_subscribe_form
- c.wiki_subscribe_form = W.wiki_subscribe_form
post_count = self.page.discussion_thread.post_count
limit, pagenum = h.paging_sanitizer(limit, page, post_count)
page = self.get_version(version)
@@ -513,15 +528,11 @@ class PageController(BaseController, FeedController):
prev = None
next = cur + 1
hide_left_bar = not (c.app.show_left_bar)
- subscribed = M.Mailbox.subscribed()
- subscribed_to_page = False
- if not subscribed:
- subscribed_to_page = M.Mailbox.subscribed(artifact=self.page)
+ subscribed_to_page = M.Mailbox.subscribed(artifact=self.page)
return dict(
page=page,
cur=cur, prev=prev, next=next,
page_subscribed=subscribed_to_page,
- subscribed=subscribed,
hide_left_bar=hide_left_bar, show_meta=c.app.show_right_bar,
pagenum=pagenum, limit=limit, count=post_count)
@@ -708,15 +719,6 @@ class PageController(BaseController, FeedController):
self.page.unsubscribe()
redirect(request.referer)
- @expose()
- @validate(W.subscribe_form)
- def wiki_subscribe(self, subscribe=None, unsubscribe=None):
- if subscribe:
- M.Mailbox.subscribe(type='direct')
- elif unsubscribe:
- M.Mailbox.unsubscribe()
- redirect(request.referer)
-
class WikiAttachmentController(ac.AttachmentController):
AttachmentClass = WM.WikiAttachment
[2/5] git commit: [#4905] ticket:634 Make logic cleaner a bit
Posted by br...@apache.org.
[#4905] ticket:634 Make logic cleaner a bit
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/6b9a52c1
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/6b9a52c1
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/6b9a52c1
Branch: refs/heads/master
Commit: 6b9a52c10d0643ac7dda24ef35f6151360555f0e
Parents: 263b6d4
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Aug 26 09:36:16 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Sep 16 15:33:36 2014 +0000
----------------------------------------------------------------------
ForgeWiki/forgewiki/wiki_main.py | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/6b9a52c1/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index 615af76..41f056e 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -513,16 +513,15 @@ class PageController(BaseController, FeedController):
prev = None
next = cur + 1
hide_left_bar = not (c.app.show_left_bar)
- tool_subscribed = M.Mailbox.subscribed()
- if tool_subscribed:
- subscribed = False
- else:
- subscribed = M.Mailbox.subscribed(artifact=self.page)
+ subscribed = M.Mailbox.subscribed()
+ subscribed_to_page = False
+ if not subscribed:
+ subscribed_to_page = M.Mailbox.subscribed(artifact=self.page)
return dict(
page=page,
cur=cur, prev=prev, next=next,
- page_subscribed=subscribed,
- subscribed=M.Mailbox.subscribed(),
+ page_subscribed=subscribed_to_page,
+ subscribed=subscribed,
hide_left_bar=hide_left_bar, show_meta=c.app.show_right_bar,
pagenum=pagenum, limit=limit, count=post_count)
[4/5] git commit: [#4905] ticket:655 Add test for wiki subscribe
Posted by br...@apache.org.
[#4905] ticket:655 Add test for wiki subscribe
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/ef66cbbd
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/ef66cbbd
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/ef66cbbd
Branch: refs/heads/master
Commit: ef66cbbddcc93adfb0f91b7bb90fee78630a8807
Parents: a39bce7
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Sep 12 10:16:10 2014 +0300
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Sep 16 15:33:36 2014 +0000
----------------------------------------------------------------------
.../forgewiki/tests/functional/test_root.py | 24 ++++++++++++++++++++
1 file changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/ef66cbbd/ForgeWiki/forgewiki/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/tests/functional/test_root.py b/ForgeWiki/forgewiki/tests/functional/test_root.py
index 072be6a..0ad3cc2 100644
--- a/ForgeWiki/forgewiki/tests/functional/test_root.py
+++ b/ForgeWiki/forgewiki/tests/functional/test_root.py
@@ -745,3 +745,27 @@ class TestRootController(TestController):
def test_user_browse_page(self):
r = self.app.get('/wiki/browse_pages/')
assert '<td>Test Admin (test-admin)</td>' in r
+
+ def test_subscribe(self):
+ user = M.User.query.get(username='test-user')
+ # user is not subscribed
+ assert not M.Mailbox.subscribed(user_id=user._id)
+ r = self.app.get('/p/test/wiki/Home/', extra_environ={'username': str(user.username)})
+ link = r.html.find('a', {'href': '/p/test/wiki/subscribe?subscribe=True'})
+ assert link is not None
+ # subscribe
+ self.app.get('/p/test/wiki/subscribe?subscribe=True',
+ extra_environ={'username': str(user.username)}).follow()
+ # user is subscribed
+ assert M.Mailbox.subscribed(user_id=user._id)
+ r = self.app.get('/p/test/wiki/Home/', extra_environ={'username': str(user.username)})
+ link = r.html.find('a', {'href': '/p/test/wiki/subscribe?unsubscribe=True'})
+ assert link is not None
+ # unsubscribe
+ self.app.get('/p/test/wiki/subscribe?unsubscribe=True',
+ extra_environ={'username': str(user.username)}).follow()
+ # user is not subscribed
+ assert not M.Mailbox.subscribed(user_id=user._id)
+ r = self.app.get('/p/test/wiki/Home/', extra_environ={'username': str(user.username)})
+ link = r.html.find('a', {'href': '/p/test/wiki/subscribe?subscribe=True'})
+ assert link is not None