Ubuntu Developer Portal

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

  1. navigation-fix
  2. Merge into stable
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
1=== modified file 'md_importer/importer/repo.py'
2--- md_importer/importer/repo.py 2016-04-17 09:17:08 +0000
3+++ md_importer/importer/repo.py 2016-04-19 08:41:18 +0000
4@@ -33,7 +33,6 @@
5 self.post_checkout_command = post_checkout_command
6 self.branch_nick = os.path.basename(self.origin.replace('.git', ''))
7 self.checkout_location = os.path.join(tempdir, self.branch_nick)
8- self.article_class = Article
9
10 def get(self):
11 sourcecode = SourceCode(self.origin, self.checkout_location,
12@@ -92,8 +91,8 @@
13 try:
14 self.index_page = IndexPage(
15 title=self.branch_nick, full_url=directive['write_to'],
16- in_navigation=True, html='', menu_title=None,
17- template=DEFAULT_TEMPLATE)
18+ in_navigation=directive['advertise'], html='',
19+ menu_title=None, template=DEFAULT_TEMPLATE)
20 self.pages.extend([self.index_page.page])
21 except ParentNotFoundException:
22 return self._abort_import(
23@@ -123,7 +122,7 @@
24 return False
25
26 def _read_article(self, fn, write_to, advertise, template):
27- article = self.article_class(fn, write_to, advertise, template)
28+ article = Article(fn, write_to, advertise, template)
29 if article.read():
30 return article
31 return None

Subscribers

People subscribed via source and target branches