Merge lp:~aacid/unity8/removeUnusedHasAttributes into lp:unity8

[Albert Astals Cid]

Remove unused hasAttributes variable

 * Are there any related MPs required for this MP to build/function as expected?
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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1200
http://jenkins.qa.ubuntu.com/job/unity8-ci/4080/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3998
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1081
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3841
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5248
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5248/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12045

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4080/rebuild

review: Approve (continuous-integration)

[lp:~aacid/unity8/removeUnusedHasAttributes]

1201. By Albert Astals Cid on 2014-08-28

Merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1201
http://jenkins.qa.ubuntu.com/job/unity8-ci/4150/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4165
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1151
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3994
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5417
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5417/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12263

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4150/rebuild

review: Needs Fixing (continuous-integration)

[Ying-Chun Liu (paulliu)]

Looks good. Working good.
BTW, why model is moved after numOfAttributes?. Doesn't matter, just curious.

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

 * Did CI run pass? If not, please explain why.
Yes previously.

review: Approve

[Albert Astals Cid (aacid)]

> Looks good. Working good.
> BTW, why model is moved after numOfAttributes?. Doesn't matter, just curious.

It was always after numOfAttributes.

=== modified file 'qml/Dash/CardTool.qml'
--- qml/Dash/CardTool.qml	2014-08-11 11:10:36 +0000
+++ qml/Dash/CardTool.qml	2014-08-28 07:40:41 +0000
@@ -169,19 +169,16 @@
 
     Item {
         id: attributesModel
-        property int numOfAttributes: 0
-        property var model: []
-        property bool hasAttributes: {
+        property int numOfAttributes: {
             var attributes = components["attributes"];
-            var hasAttributesFlag = (attributes != undefined) && attributes["field"];
-
-            if (hasAttributesFlag) {
+            if ((attributes != undefined) && attributes["field"]) {
                 if (attributes["max-count"]) {
-                    numOfAttributes = attributes["max-count"];
+                    return attributes["max-count"];
                 }
             }
-            return hasAttributesFlag
+            return 0;
         }
+        property var model: []
 
         onNumOfAttributesChanged: {
             model = []