allura
Fork

Commit

[#4208] ticket:87 refactor and change the code

--- a/Allura/allura/command/create_neighborhood.py

+++ b/Allura/allura/command/create_neighborhood.py

		@@ -31,7 +31,12 @@ class UpdateNeighborhoodCommand(base.Command):
31	31	min_args=3
32	32	max_args=None
33	33	usage = '<ini file> <neighborhood_shortname> <home_tool_active>'
34		- summary = 'Activate Home application for neighborhood'
	34	+ summary = 'Activate Home application for neighborhood\r\n' \
	35	+ '\t<neighborhood> - the neighborhood name\r\n' \
	36	+ '\t<value> - boolean value to install/uninstall Home tool\r\n' \
	37	+ '\t must be True or False\r\n\r\n' \
	38	+ '\tExample:\r\n' \
	39	+ '\tpaster update-neighborhood-home-tool development.ini Projects True'
35	40	parser = base.Command.standard_parser(verbose=True)
36	41
37	42	def command(self):

		@@ -47,7 +52,7 @@ class UpdateNeighborhoodCommand(base.Command):
47	52	else:
48	53	home_tool_active = False
49	54
50		- if home_tool_active == nb.have_home_project:
	55	+ if home_tool_active == nb.has_home_project:
51	56	return
52	57
53	58	p = nb.neighborhood_project

--- a/Allura/allura/controllers/project.py

+++ b/Allura/allura/controllers/project.py

		@@ -90,8 +90,15 @@ class NeighborhoodController(object):
90	90	c.project = self.neighborhood.neighborhood_project
91	91	if self.neighborhood.redirect:
92	92	redirect(self.neighborhood.redirect)
93		- if not self.neighborhood.have_home_project:
94		- redirect(c.project.script_name + 'wiki/')
	93	+ if not self.neighborhood.has_home_project:
	94	+ mount = c.project.first_mount()
	95	+ if mount is not None:
	96	+ if 'ac' in mount:
	97	+ redirect(mount['ac'].options.mount_point + '/')
	98	+ elif 'sub' in mount:
	99	+ redirect(mount['sub'].url())
	100	+ else:
	101	+ redirect(c.project.app_configs[0].options.mount_point + '/')
95	102	c.project_summary = W.project_summary
96	103	c.page_list = W.page_list
97	104	limit, page, start = g.handle_paging(limit, page)

--- a/Allura/allura/model/neighborhood.py

+++ b/Allura/allura/model/neighborhood.py

		@@ -109,11 +109,8 @@ class Neighborhood(MappedClass):
109	109	return ""
110	110
111	111	@property
112		- def have_home_project(self):
113		- if self.neighborhood_project.app_config('home') is not None:
114		- return True
115		- else:
116		- return False
	112	+ def has_home_project(self):
	113	+ return self.neighborhood_project.app_config('home') is not None
117	114
118	115	@property
119	116	def icon(self):

--- a/Allura/allura/templates/widgets/neighborhood_overview_form.html

+++ b/Allura/allura/templates/widgets/neighborhood_overview_form.html

		@@ -5,7 +5,7 @@
5	5	<div class="grid-14">{{widget.display_field(widget.fields.name)}}</div>
6	6	<label class="grid-4">Redirect</label>
7	7	<div class="grid-14">{{widget.display_field(widget.fields.redirect)}}</div>
8		- {% if value.have_home_project %}
	8	+ {% if value.has_home_project %}
9	9	<label class="grid-4">Home Content (HTML)</label>
10	10	<div class="grid-14">{{widget.display_field(widget.fields.homepage)}}</div>
11	11	<label class="grid-4">Allow Browsing</label>

--- a/Allura/allura/tests/test_commands.py

+++ b/Allura/allura/tests/test_commands.py

		@@ -143,10 +143,10 @@ def test_update_neighborhood():
143	143	cmd.run([test_config, 'Projects', 'True'])
144	144	cmd.command()
145	145	nb = M.Neighborhood.query.get(name='Projects')
146		- assert nb.have_home_project == True
	146	+ assert nb.has_home_project == True
147	147
148	148	cmd = create_neighborhood.UpdateNeighborhoodCommand('update-neighborhood')
149	149	cmd.run([test_config, 'Projects', 'False'])
150	150	cmd.command()
151	151	nb = M.Neighborhood.query.get(name='Projects')
152		- assert nb.have_home_project == False
	152	+ assert nb.has_home_project == False

--- a/Allura/setup.py

+++ b/Allura/setup.py

		@@ -111,7 +111,7 @@ setup(
111	111	set-tool-access = allura.command:SetToolAccessCommand
112	112	smtp_server=allura.command:SMTPServerCommand
113	113	create-neighborhood = allura.command:CreateNeighborhoodCommand
114		- update-neighborhood = allura.command:UpdateNeighborhoodCommand
	114	+ update-neighborhood-home-tool = allura.command:UpdateNeighborhoodCommand
115	115	create-trove-categories = allura.command:CreateTroveCategoriesCommand
116	116	set-neighborhood-features = allura.command:SetNeighborhoodFeaturesCommand
117	117	pull-rss-feeds = allura.command.rssfeeds:RssFeedsCommand