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
=== modified file 'article_items/ArticleFullImg.qml'
--- article_items/ArticleFullImg.qml 2013-10-06 09:52:58 +0000
+++ article_items/ArticleFullImg.qml 2013-10-07 13:49:10 +0000
@@ -76,8 +76,8 @@
76 anchors.verticalCenter: labelTime.verticalCenter76 anchors.verticalCenter: labelTime.verticalCenter
77 fillMode: Image.PreserveAspectCrop77 fillMode: Image.PreserveAspectCrop
78 source: Qt.resolvedUrl("../icons_tmp/favorite-selected.svg")78 source: Qt.resolvedUrl("../icons_tmp/favorite-selected.svg")
79 sourceSize.height: modelItem.favourite == "1" ? units.gu(1.5) : 079 sourceSize.height: invalid ? 0 : (modelItem.favourite == "1" ? units.gu(1.5) : 0)
80 visible: modelItem.favourite == "1"80 visible: invalid ? false : (modelItem.favourite == "1")
81 }81 }
8282
83 Label {83 Label {
8484
=== modified file 'article_items/ArticleOneImgA.qml'
--- article_items/ArticleOneImgA.qml 2013-10-06 09:52:58 +0000
+++ article_items/ArticleOneImgA.qml 2013-10-07 13:49:10 +0000
@@ -74,8 +74,8 @@
74 anchors.verticalCenter: labelTime.verticalCenter74 anchors.verticalCenter: labelTime.verticalCenter
75 fillMode: Image.PreserveAspectCrop75 fillMode: Image.PreserveAspectCrop
76 source: Qt.resolvedUrl("../icons_tmp/favorite-selected.svg")76 source: Qt.resolvedUrl("../icons_tmp/favorite-selected.svg")
77 sourceSize.height: modelItem.favourite == "1" ? units.gu(1.5) : 077 sourceSize.height: invalid ? 0 : (modelItem.favourite == "1" ? units.gu(1.5) : 0)
78 visible: modelItem.favourite == "1"78 visible: invalid ? false : (modelItem.favourite == "1")
79 }79 }
8080
81 Label {81 Label {
8282
=== modified file 'article_items/ArticleTextA.qml'
--- article_items/ArticleTextA.qml 2013-10-06 09:52:58 +0000
+++ article_items/ArticleTextA.qml 2013-10-07 13:49:10 +0000
@@ -44,8 +44,8 @@
44 anchors.verticalCenter: labelTime.verticalCenter44 anchors.verticalCenter: labelTime.verticalCenter
45 fillMode: Image.PreserveAspectCrop45 fillMode: Image.PreserveAspectCrop
46 source: Qt.resolvedUrl("../icons_tmp/favorite-selected.svg")46 source: Qt.resolvedUrl("../icons_tmp/favorite-selected.svg")
47 sourceSize.height: modelItem.favourite == "1" ? units.gu(1.5) : 047 sourceSize.height: invalid ? 0 : (modelItem.favourite == "1" ? units.gu(1.5) : 0)
48 visible: modelItem.favourite == "1"48 visible: invalid ? false : (modelItem.favourite == "1")
49 }49 }
5050
51 Label {51 Label {
5252
=== modified file 'article_items/ArticleTextB.qml'
--- article_items/ArticleTextB.qml 2013-10-06 09:52:58 +0000
+++ article_items/ArticleTextB.qml 2013-10-07 13:49:10 +0000
@@ -42,8 +42,8 @@
42 anchors.verticalCenter: labelTime.verticalCenter42 anchors.verticalCenter: labelTime.verticalCenter
43 fillMode: Image.PreserveAspectCrop43 fillMode: Image.PreserveAspectCrop
44 source: Qt.resolvedUrl("../icons_tmp/favorite-selected.svg")44 source: Qt.resolvedUrl("../icons_tmp/favorite-selected.svg")
45 sourceSize.height: modelItem.favourite == "1" ? units.gu(1.5) : 045 sourceSize.height: invalid ? 0 : (modelItem.favourite == "1" ? units.gu(1.5) : 0)
46 visible: modelItem.favourite == "1"46 visible: invalid ? false : (modelItem.favourite == "1")
47 }47 }
4848
49 Label {49 Label {
5050
=== modified file 'feeds/EditFeed.qml'
--- feeds/EditFeed.qml 2013-10-04 13:42:40 +0000
+++ feeds/EditFeed.qml 2013-10-07 13:49:10 +0000
@@ -52,14 +52,17 @@
52 text: i18n.tr("Done")52 text: i18n.tr("Done")
53 gradient: UbuntuColors.orangeGradient53 gradient: UbuntuColors.orangeGradient
54 anchors.verticalCenter: parent.verticalCenter54 anchors.verticalCenter: parent.verticalCenter
55 visible: previousTopicId != newTopicId
5556
56 onClicked:57 onClicked:
57 {58 {
58// DB.updateFeedByUser(feedId, feedTitle, feedURL) ;59 if (previousTopicId != newTopicId) {
59 DB.deleteFeedTag(feedId, previousTopicId) ;60 // DB.updateFeedByUser(feedId, feedTitle, feedURL) ;
60 DB.addFeedTag(feedId, newTopicId) ;61 DB.deleteFeedTag(feedId, previousTopicId) ;
61 apply(feedId, newTopicId, previousTopicId) ;62 DB.addFeedTag(feedId, newTopicId) ;
62 pageStack.pop() ;63 apply(feedId, newTopicId, previousTopicId) ;
64 pageStack.pop() ;
65 }
63 }66 }
64 }67 }
65 }68 }

Subscribers

People subscribed via source and target branches