allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [6/9] git commit: [#7292] don't need to list tools in profile API, already in user-project API
Date Mon, 21 Apr 2014 17:24:05 GMT
[#7292] don't need to list tools in profile API, already in user-project API


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/6b9cea05
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/6b9cea05
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/6b9cea05

Branch: refs/heads/master
Commit: 6b9cea0509389e09b43c5af9a2af325d80f9bb12
Parents: 952ce22
Author: Dave Brondsema <dbrondsema@slashdotmedia.com>
Authored: Mon Apr 21 15:51:41 2014 +0000
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Mon Apr 21 17:22:28 2014 +0000

----------------------------------------------------------------------
 Allura/allura/ext/user_profile/user_main.py | 14 --------------
 Allura/allura/tests/functional/test_rest.py |  1 -
 2 files changed, 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/6b9cea05/Allura/allura/ext/user_profile/user_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/user_profile/user_main.py b/Allura/allura/ext/user_profile/user_main.py
index 44ae741..dde500c 100644
--- a/Allura/allura/ext/user_profile/user_main.py
+++ b/Allura/allura/ext/user_profile/user_main.py
@@ -340,20 +340,6 @@ class SkillsSection(ProfileSectionBase):
 class ToolsSection(ProfileSectionBase):
     template = 'allura.ext.user_profile:templates/sections/tools.html'
 
-    def __json__(self):
-        tools = []
-        for tool in c.project.grouped_navbar_entries():
-            tool_json = dict(
-                url=tool.url,
-                label=tool.label)
-            if tool.children:
-                tool_json['children'] = [
-                    dict(url=child.url, label=child.label)
-                    for child in tool.children
-                ]
-            tools.append(tool_json)
-        return dict(tools=tools)
-
 
 class SocialSection(ProfileSectionBase):
     template = 'allura.ext.user_profile:templates/sections/social.html'

http://git-wip-us.apache.org/repos/asf/allura/blob/6b9cea05/Allura/allura/tests/functional/test_rest.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_rest.py b/Allura/allura/tests/functional/test_rest.py
index 0d6954d..7bc2334 100644
--- a/Allura/allura/tests/functional/test_rest.py
+++ b/Allura/allura/tests/functional/test_rest.py
@@ -307,5 +307,4 @@ class TestUserProfile(TestRestApiBase):
         assert_in('skypeaccount', json)
         assert_in('socialnetworks', json)
         assert_in('telnumbers', json)
-        assert_in('tools', json)
         assert_in('webpages', json)


Mime
View raw message