Merge lp:~dholbach/developer-ubuntu-com/navigation-fix into lp:developer-ubuntu-com

Proposed by Daniel Holbach
Status: Merged
Merged at revision: 213
Proposed branch: lp:~dholbach/developer-ubuntu-com/navigation-fix
Merge into: lp:developer-ubuntu-com
Diff against target: 31 lines (+3/-4)
1 file modified
md_importer/importer/repo.py (+3/-4)
To merge this branch: bzr merge lp:~dholbach/developer-ubuntu-com/navigation-fix
Reviewer Review Type Date Requested Status
Ubuntu App Developer site developers Pending
Review via email: mp+292238@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'md_importer/importer/repo.py'
--- md_importer/importer/repo.py 2016-04-17 09:17:08 +0000
+++ md_importer/importer/repo.py 2016-04-19 08:41:18 +0000
@@ -33,7 +33,6 @@
33 self.post_checkout_command = post_checkout_command33 self.post_checkout_command = post_checkout_command
34 self.branch_nick = os.path.basename(self.origin.replace('.git', ''))34 self.branch_nick = os.path.basename(self.origin.replace('.git', ''))
35 self.checkout_location = os.path.join(tempdir, self.branch_nick)35 self.checkout_location = os.path.join(tempdir, self.branch_nick)
36 self.article_class = Article
3736
38 def get(self):37 def get(self):
39 sourcecode = SourceCode(self.origin, self.checkout_location,38 sourcecode = SourceCode(self.origin, self.checkout_location,
@@ -92,8 +91,8 @@
92 try:91 try:
93 self.index_page = IndexPage(92 self.index_page = IndexPage(
94 title=self.branch_nick, full_url=directive['write_to'],93 title=self.branch_nick, full_url=directive['write_to'],
95 in_navigation=True, html='', menu_title=None,94 in_navigation=directive['advertise'], html='',
96 template=DEFAULT_TEMPLATE)95 menu_title=None, template=DEFAULT_TEMPLATE)
97 self.pages.extend([self.index_page.page])96 self.pages.extend([self.index_page.page])
98 except ParentNotFoundException:97 except ParentNotFoundException:
99 return self._abort_import(98 return self._abort_import(
@@ -123,7 +122,7 @@
123 return False122 return False
124123
125 def _read_article(self, fn, write_to, advertise, template):124 def _read_article(self, fn, write_to, advertise, template):
126 article = self.article_class(fn, write_to, advertise, template)125 article = Article(fn, write_to, advertise, template)
127 if article.read():126 if article.read():
128 return article127 return article
129 return None128 return None

Subscribers

People subscribed via source and target branches