Merge lp:~brendan-donegan/checkbox/bug1314516_cli into lp:checkbox

[Brendan Donegan]

Like in checkbox-gui, we want to have the following schema for displaying jobs in the HUI

- Always prefer summary.
- If no summary is available use partial_id, unless the job is local in which case use description.

[Brendan Donegan (brendan-donegan)]

The modification to job.py makes me a little bit queasy, but I can't think of a better way.

[Zygmunt Krynicki (zyga)]

+1

I'll try to merge this change with my near-complete rewrite of the CLI.

Thanks
ZK

review: Approve

=== modified file 'checkbox-ng/checkbox_ng/commands/cli.py'
--- checkbox-ng/checkbox_ng/commands/cli.py	2014-05-02 13:47:35 +0000
+++ checkbox-ng/checkbox_ng/commands/cli.py	2014-05-08 08:58:36 +0000
@@ -136,7 +136,7 @@
                 prefix = '[ ]'
                 if self.job_selection[job]:
                     prefix = '[X]'
-                title = job.partial_id
+                title = job.summary
                 line = prefix + self.depth * '   ' + '   ' + title
                 if len(line) > cols:
                     col_max = cols - 4  # includes len('...') + a space

=== modified file 'plainbox/plainbox/impl/job.py'
--- plainbox/plainbox/impl/job.py	2014-05-07 12:59:01 +0000
+++ plainbox/plainbox/impl/job.py	2014-05-08 08:58:36 +0000
@@ -703,7 +703,10 @@
         if legacy_mode:  # using local jobs
             for job in [j for j in job_list if j.via == link]:
                 if job.plugin == 'local':
-                    category = cls(job.description)
+                    if job.summary == job.partial_id:
+                        category = cls(job.description)
+                    else:
+                        category = cls(job.summary)
                     cls.create_tree(job_list, category, job.checksum,
                                     legacy_mode)
                     node.add_category(category)