Ubuntu Shorts App

Merge lp:~qqworini/ubuntu-rssreader-app/article-bug-and-edit-feed-bug into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

  1. article-bug-and-edit-feed-bug
  2. Merge into trunk
Proposed by Joey Chan
Status: Merged
Approved by: Roman Shchekin
Approved revision: 96
Merged at revision: 98
Proposed branch: lp:~qqworini/ubuntu-rssreader-app/article-bug-and-edit-feed-bug
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 86 lines (+16/-13)
5 files modified
article_items/ArticleFullImg.qml (+2/-2)
article_items/ArticleOneImgA.qml (+2/-2)
article_items/ArticleTextA.qml (+2/-2)
article_items/ArticleTextB.qml (+2/-2)
feeds/EditFeed.qml (+8/-5)
To merge this branch: bzr merge lp:~qqworini/ubuntu-rssreader-app/article-bug-and-edit-feed-bug
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Shorts Developers Pending
Review via email: mp+189604@code.launchpad.net

Commit message

fix article bug and edit-feed bug

Description of the change

fix article bug and edit-feed bug

now no error msg come from article items

now in edit-feed page, "done" button only visible when topic changed

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:96
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/84/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/776
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/84
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/84
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/84
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/84

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/84/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'article_items/ArticleFullImg.qml'
2--- article_items/ArticleFullImg.qml 2013-10-06 09:52:58 +0000
3+++ article_items/ArticleFullImg.qml 2013-10-07 13:49:10 +0000
4@@ -76,8 +76,8 @@
5 anchors.verticalCenter: labelTime.verticalCenter
6 fillMode: Image.PreserveAspectCrop
7 source: Qt.resolvedUrl("../icons_tmp/favorite-selected.svg")
8- sourceSize.height: modelItem.favourite == "1" ? units.gu(1.5) : 0
9- visible: modelItem.favourite == "1"
10+ sourceSize.height: invalid ? 0 : (modelItem.favourite == "1" ? units.gu(1.5) : 0)
11+ visible: invalid ? false : (modelItem.favourite == "1")
12 }
13
14 Label {
15
16=== modified file 'article_items/ArticleOneImgA.qml'
17--- article_items/ArticleOneImgA.qml 2013-10-06 09:52:58 +0000
18+++ article_items/ArticleOneImgA.qml 2013-10-07 13:49:10 +0000
19@@ -74,8 +74,8 @@
20 anchors.verticalCenter: labelTime.verticalCenter
21 fillMode: Image.PreserveAspectCrop
22 source: Qt.resolvedUrl("../icons_tmp/favorite-selected.svg")
23- sourceSize.height: modelItem.favourite == "1" ? units.gu(1.5) : 0
24- visible: modelItem.favourite == "1"
25+ sourceSize.height: invalid ? 0 : (modelItem.favourite == "1" ? units.gu(1.5) : 0)
26+ visible: invalid ? false : (modelItem.favourite == "1")
27 }
28
29 Label {
30
31=== modified file 'article_items/ArticleTextA.qml'
32--- article_items/ArticleTextA.qml 2013-10-06 09:52:58 +0000
33+++ article_items/ArticleTextA.qml 2013-10-07 13:49:10 +0000
34@@ -44,8 +44,8 @@
35 anchors.verticalCenter: labelTime.verticalCenter
36 fillMode: Image.PreserveAspectCrop
37 source: Qt.resolvedUrl("../icons_tmp/favorite-selected.svg")
38- sourceSize.height: modelItem.favourite == "1" ? units.gu(1.5) : 0
39- visible: modelItem.favourite == "1"
40+ sourceSize.height: invalid ? 0 : (modelItem.favourite == "1" ? units.gu(1.5) : 0)
41+ visible: invalid ? false : (modelItem.favourite == "1")
42 }
43
44 Label {
45
46=== modified file 'article_items/ArticleTextB.qml'
47--- article_items/ArticleTextB.qml 2013-10-06 09:52:58 +0000
48+++ article_items/ArticleTextB.qml 2013-10-07 13:49:10 +0000
49@@ -42,8 +42,8 @@
50 anchors.verticalCenter: labelTime.verticalCenter
51 fillMode: Image.PreserveAspectCrop
52 source: Qt.resolvedUrl("../icons_tmp/favorite-selected.svg")
53- sourceSize.height: modelItem.favourite == "1" ? units.gu(1.5) : 0
54- visible: modelItem.favourite == "1"
55+ sourceSize.height: invalid ? 0 : (modelItem.favourite == "1" ? units.gu(1.5) : 0)
56+ visible: invalid ? false : (modelItem.favourite == "1")
57 }
58
59 Label {
60
61=== modified file 'feeds/EditFeed.qml'
62--- feeds/EditFeed.qml 2013-10-04 13:42:40 +0000
63+++ feeds/EditFeed.qml 2013-10-07 13:49:10 +0000
64@@ -52,14 +52,17 @@
65 text: i18n.tr("Done")
66 gradient: UbuntuColors.orangeGradient
67 anchors.verticalCenter: parent.verticalCenter
68+ visible: previousTopicId != newTopicId
69
70 onClicked:
71 {
72-// DB.updateFeedByUser(feedId, feedTitle, feedURL) ;
73- DB.deleteFeedTag(feedId, previousTopicId) ;
74- DB.addFeedTag(feedId, newTopicId) ;
75- apply(feedId, newTopicId, previousTopicId) ;
76- pageStack.pop() ;
77+ if (previousTopicId != newTopicId) {
78+ // DB.updateFeedByUser(feedId, feedTitle, feedURL) ;
79+ DB.deleteFeedTag(feedId, previousTopicId) ;
80+ DB.addFeedTag(feedId, newTopicId) ;
81+ apply(feedId, newTopicId, previousTopicId) ;
82+ pageStack.pop() ;
83+ }
84 }
85 }
86 }

Subscribers

People subscribed via source and target branches