Merge lp:~feng-kylin/unity8/openPrepopulatedScopeInManageDash into lp:unity8

Proposed by handsome_feng
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 1748
Merged at revision: 1763
Proposed branch: lp:~feng-kylin/unity8/openPrepopulatedScopeInManageDash
Merge into: lp:unity8
Diff against target: 59 lines (+12/-1)
3 files modified
qml/Dash/Dash.qml (+5/-0)
qml/Dash/ScopesList.qml (+2/-0)
qml/Dash/ScopesListCategory.qml (+5/-1)
To merge this branch: bzr merge lp:~feng-kylin/unity8/openPrepopulatedScopeInManageDash
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Paweł Stołowski Approve
Review via email: mp+257616@code.launchpad.net

Commit message

When click the favorite scope in Dash Manager , it just return to the corresponding scope page.

Description of the change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
no
 * Did you perform an exploratory manual test run of your code change and any related functionality?
yes
 * Did you make sure that your branch does not contain spurious tags?
yes
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
 * If you changed the UI, has there been a design review?
n/a

To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) wrote :

Honestly i think this is something that should be fixed in the scopes shell plugin but let's see what Pawel says about it.

Revision history for this message
Paweł Stołowski (stolowski) wrote :

Ok, after some investigation I think what this fix does it OK. Since the existing code takes the "fake" result from manage dash model results and activates its uri (which is a canned query like scope://... pointing to the respective scope), we would need to special case it in the plugin code *not* to re-do search, but this is impossible since it's the same execution path we hit when e.g. a redo-search action is triggered in a preview (where we want to re-execute the search even if search string is the same). So, +1 for this fix & thanks!

review: Approve
Revision history for this message
Albert Astals Cid (aacid) wrote :

Ok, i've triggered CI, let's see what it says

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass?
Yes, except the 3 failures we all love

 * Did you make sure that the branch does not contain spurious tags?
N/A

review: Approve
Revision history for this message
Albert Astals Cid (aacid) wrote :

And by

* Did you make sure that the branch does not contain spurious tags?
N/A

i mean

 * Did you make sure that the branch does not contain spurious tags?
Yes

Revision history for this message
Michael Zanetti (mzanetti) wrote :

@handsome_feng: Thank you for you contribution. For future branches, please make sure to put the checklist into the description as specified here: https://wiki.ubuntu.com/Process/Merges/Checklists/Unity8

This helps us with getting the branch merged.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Dash/Dash.qml'
2--- qml/Dash/Dash.qml 2015-04-09 14:00:37 +0000
3+++ qml/Dash/Dash.qml 2015-04-28 07:58:46 +0000
4@@ -187,6 +187,11 @@
5 onRequestFavoriteMoveTo: {
6 scopes.moveFavoriteTo(scopeId, index);
7 }
8+ onRequestRestore: {
9+ bottomEdgeController.enableAnimation = true;
10+ bottomEdgeController.progress = 0;
11+ dash.setCurrentScope(scopeId, false, false);
12+ }
13
14 Binding {
15 target: scopesList.scope
16
17=== modified file 'qml/Dash/ScopesList.qml'
18--- qml/Dash/ScopesList.qml 2015-01-05 10:40:46 +0000
19+++ qml/Dash/ScopesList.qml 2015-04-28 07:58:46 +0000
20@@ -31,6 +31,7 @@
21 signal storeClicked()
22 signal requestFavorite(string scopeId, bool favorite)
23 signal requestFavoriteMoveTo(string scopeId, int index)
24+ signal requestRestore(string scopeId)
25
26 state: "browse"
27
28@@ -124,6 +125,7 @@
29 onRequestEditMode: root.state = "edit";
30 onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index);
31 onRequestActivate: root.scope.activate(result);
32+ onRequestRestore: root.requestRestore(scopeId);
33 }
34 }
35 }
36
37=== modified file 'qml/Dash/ScopesListCategory.qml'
38--- qml/Dash/ScopesListCategory.qml 2014-12-12 09:49:02 +0000
39+++ qml/Dash/ScopesListCategory.qml 2015-04-28 07:58:46 +0000
40@@ -35,6 +35,7 @@
41 signal requestEditMode()
42 signal requestScopeMoveTo(string scopeId, int index)
43 signal requestActivate(var result)
44+ signal requestRestore(string scopeId)
45
46 implicitHeight: visible ? childrenRect.height : 0
47
48@@ -93,7 +94,10 @@
49
50 onClicked: {
51 if (!editMode) {
52- root.requestActivate(result);
53+ if (root.isFavoritesFeed)
54+ root.requestRestore(model.scopeId);
55+ else
56+ root.requestActivate(result);
57 }
58 }
59 onPressAndHold: {

Subscribers

People subscribed via source and target branches