Commit: e2b0ffd58cb4d79c4cf63cdae60d7637738f8b8c - allura (git)

allura

Commit MetaInfo

• Revision: e2b0ffd58cb4d79c4cf63cdae60d7637738f8b8c (tree)
• Time: 2012-06-28 18:39:27
• Author: Igor Bondarenko <jetmind2@gmai...>
• Commiter: Igor Bondarenko

Log Message

[#4457] ticket:95 Fix has_home_tool() implementation.

Check by tool type, not by mount_point.

Change Summary

• modified: Allura/allura/model/neighborhood.py
• modified: Allura/allura/model/project.py

Incremental Difference

--- a/Allura/allura/model/neighborhood.py
+++ b/Allura/allura/model/neighborhood.py
@@ -111,7 +111,8 @@ class Neighborhood(MappedClass):
 
     @property
     def has_home_tool(self):
-        return self.neighborhood_project.app_config('home') is not None
+        return (self.neighborhood_project
+                    .app_config_by_tool_type('home') is not None)
 
     @property
     def icon(self):

--- a/Allura/allura/model/project.py
+++ b/Allura/allura/model/project.py
@@ -514,6 +514,11 @@ class Project(MappedClass):
                 'project_id':self._id,
                 'options.mount_point':mount_point}).first()
 
+    def app_config_by_tool_type(self, tool_type):
+        return AppConfig.query.find({
+                'project_id': self._id,
+                'tool_name': tool_type}).first()
+
     def new_subproject(self, name, install_apps=True, user=None):
         if not h.re_path_portion.match(name):
             raise exceptions.ToolError, 'Mount point "%s" is invalid' % name