Merge lp://qastaging/~stolowski/unity-scope-home/filters-no-empty-masters into lp://qastaging/unity-scope-home

Proposed by Paweł Stołowski
Status: Merged
Approved by: Michal Hruby
Approved revision: 148
Merged at revision: 148
Proposed branch: lp://qastaging/~stolowski/unity-scope-home/filters-no-empty-masters
Merge into: lp://qastaging/unity-scope-home
Diff against target: 44 lines (+13/-2)
2 files modified
src/meta-scope-registry.vala (+7/-0)
src/scope.vala (+6/-2)
To merge this branch: bzr merge lp://qastaging/~stolowski/unity-scope-home/filters-no-empty-masters
Reviewer Review Type Date Requested Status
Michal Hruby (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+181074@code.qastaging.launchpad.net

Commit message

Don't add master scope to Categories filter if it has no scopes.

Description of the change

Don't add master scope to Categories filter if it has no scopes.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Michal Hruby (mhr3) wrote :

Needs to handle remote scopes too...

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
147. By Paweł Stołowski

Fix formatting.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Michal Hruby (mhr3) wrote :

Is there a simple way to add a test for this?

9 + public bool has_scopes (string master_scope_id)

Would be more expressive as "has_subscopes()".

review: Needs Information
148. By Paweł Stołowski

Renamed has_scopes to has_subscopes.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Paweł Stołowski (stolowski) wrote :

> Is there a simple way to add a test for this?
Simple - not. It would require changing populate_filters() implementation a bit to make it independent of HS, so that it's not necessary to create HS instance... And then mocking some stuff.

> 9 + public bool has_scopes (string master_scope_id)
>
> Would be more expressive as "has_subscopes()".
Renamed.

Revision history for this message
Michal Hruby (mhr3) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: