You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/12/28 10:05:34 UTC
[1/2] allura git commit: [#8037] ticket:881 Change title of item in
admin_menu
Repository: allura
Updated Branches:
refs/heads/ib/8037 [created] 2c0a08ca6
[#8037] ticket:881 Change title of item in admin_menu
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/782a9051
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/782a9051
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/782a9051
Branch: refs/heads/ib/8037
Commit: 782a90511cfab139c1ddff8cba72204cd058d1e4
Parents: a784bde
Author: Denis Kotov <de...@gmail.com>
Authored: Fri Dec 25 13:19:21 2015 +0200
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Mon Dec 28 10:53:15 2015 +0200
----------------------------------------------------------------------
Allura/allura/app.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/782a9051/Allura/allura/app.py
----------------------------------------------------------------------
diff --git a/Allura/allura/app.py b/Allura/allura/app.py
index 5e85e85..d71a3fc 100644
--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -638,7 +638,7 @@ class Application(object):
links.append(
SitemapEntry('Options', admin_url + 'options', className='admin_modal'))
links.append(
- SitemapEntry('Label', admin_url + 'edit_label', className='admin_modal'))
+ SitemapEntry('Rename', admin_url + 'edit_label', className='admin_modal'))
if len(self._webhooks) > 0:
links.append(SitemapEntry('Webhooks', admin_url + 'webhooks'))
return links
[2/2] allura git commit: [#8037] ticket:881 fix tests, change docsting
Posted by je...@apache.org.
[#8037] ticket:881 fix tests, change docsting
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/2c0a08ca
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/2c0a08ca
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/2c0a08ca
Branch: refs/heads/ib/8037
Commit: 2c0a08ca64ee313f5ef81e01e62ba3c198398d27
Parents: 782a905
Author: Denis Kotov <de...@gmail.com>
Authored: Fri Dec 25 19:18:35 2015 +0200
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Mon Dec 28 10:53:24 2015 +0200
----------------------------------------------------------------------
Allura/allura/app.py | 2 +-
ForgeWiki/forgewiki/tests/functional/test_root.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/2c0a08ca/Allura/allura/app.py
----------------------------------------------------------------------
diff --git a/Allura/allura/app.py b/Allura/allura/app.py
index d71a3fc..470c1cb 100644
--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -617,7 +617,7 @@ class Application(object):
project in which this Application is installed
- 'Options', if this Application has custom options, or
``force_options`` is True
- - 'Label', for editing this Application's label
+ - 'Rename', for editing this Application's label
- 'Webhooks', if this Application can trigger any webhooks
Subclasses should override this method to provide additional admin
http://git-wip-us.apache.org/repos/asf/allura/blob/2c0a08ca/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 9a88fd1..f413b9c 100644
--- a/ForgeWiki/forgewiki/tests/functional/test_root.py
+++ b/ForgeWiki/forgewiki/tests/functional/test_root.py
@@ -826,7 +826,7 @@ class TestRootController(TestController):
menu = [li.find('span').getText() for li in menu.findAll('li')]
assert_equal(
menu,
- ['Set Home', 'Permissions', 'Options', 'Label', 'Delete'])
+ ['Set Home', 'Permissions', 'Options', 'Rename', 'Delete'])
def test_sidebar_admin_menu_is_expanded(self):
r = self.app.get('/p/test/admin/wiki/permissions')