Merge lp:~mabac/launchpad-work-items-tracker/misc-clean-up into lp:~linaro-automation/launchpad-work-items-tracker/linaro

[Mattias Backman]

Latest kiko requests.

[lp:~mabac/launchpad-work-items-tracker/misc-clean-up]

325. By Mattias Backman on 2011-12-22

Get the Papyrs link from custom_field_2 in Kanbantool.

[Данило Шеган (danilo)]

There's a conflict marker in now.

Also, to move the "Lane:" to the same line as the h1, you can output it to HTML before it and set the style to "float: right".

Otherwise, looks good to land.

review: Approve

=== modified file 'collect_roadmap'
--- collect_roadmap	2011-12-21 14:05:45 +0000
+++ collect_roadmap	2011-12-22 11:04:11 +0000
@@ -138,6 +138,7 @@
             model_card.sponsor = get_json_item(task['task'],
                                                'custom_field_1')
 
+<<<<<<< TREE
             external_link = task['task']['external_link']
             if external_link is not None and external_link is not '':
                 model_card.url = unicode_or_None(external_link)
@@ -148,6 +149,20 @@
                 model_card.acceptance_criteria = get_json_item(
                     papyrs_data, 'acceptance_criteria')
             collector.store_card(model_card)
+=======
+                external_link = task['task']['custom_field_2']
+                if external_link is not None and external_link is not '':
+                    model_card.url = unicode_or_None(external_link)
+                    dbg('Getting Papyrs information from %s.' % external_link)
+                    papyrs_data = papyrs_import(collector, external_link)
+                    model_card.description = get_json_item(papyrs_data,
+                                                           'description')
+                    model_card.acceptance_criteria = get_json_item(
+                        papyrs_data, 'acceptance_criteria')
+                collector.store_card(model_card)
+        else:
+            dbg("Task '%s' does not have a status." % task['task']['name'])
+>>>>>>> MERGE-SOURCE
 
 
 def kanban_import(collector, cfg, board_id, api_token):

=== modified file 'report_tools.py'
--- report_tools.py	2011-12-19 14:19:45 +0000
+++ report_tools.py	2011-12-22 11:04:11 +0000
@@ -207,9 +207,8 @@
 def roadmap_pages(my_path, database, basename, config, lane, root=None):
     cfg = load_config(config)
     fh = open(basename + '.html', 'w')
-    # XXX fix this. the intention is to have the chart in the same dir as the
-    # html. This is not essential but makes linking in roadmap_lane.html easier
-    chart_name = '/'.join(basename.split('/')[:-1]) + '/current_quarter.svg'
+    chart_path, _ = os.path.split(basename)
+    chart_name = os.path.join(chart_path, 'current_quarter.svg')
     try:
         args = [os.path.join(my_path, 'html-report'), '-d', database]
         args += ['--report-type', 'roadmap_page']

=== modified file 'templates/roadmap_lane.html'
--- templates/roadmap_lane.html	2011-12-20 10:26:10 +0000
+++ templates/roadmap_lane.html	2011-12-22 11:04:11 +0000
@@ -13,8 +13,7 @@
 <h1>${title()}</h1>
 
 <p style="text-align: right; color: green; font-size: 13pt">
-Select calendar quarter to view:<br>
-<select name="laneselect" onchange="window.location=this.value;">
+Lane:&nbsp;<select name="laneselect" onchange="window.location=this.value;">
 % for lane in lanes:
 <option value="${lane.name}.html"${' selected="selected"' if lane.name == lane_title else ''}>${lane.name}${' (current)' if lane.is_current else ''}</option>
 % endfor