history-service

Merge lp://staging/~phablet-team/history-service/thread_search_model into lp://staging/history-service

  1. thread_search_model
  2. Merge into trunk
Proposed by Gustavo Pichorim Boiko
Status: Work in progress
Proposed branch: lp://staging/~phablet-team/history-service/thread_search_model
Merge into: lp://staging/history-service
Diff against target: 1280 lines (+645/-114)
21 files modified
Ubuntu/History/CMakeLists.txt (+1/-1)
Ubuntu/History/historygroupedthreadsmodel.cpp (+25/-8)
Ubuntu/History/historythreadmodel.cpp (+172/-16)
Ubuntu/History/historythreadmodel.h (+24/-0)
daemon/historydaemon.cpp (+37/-11)
daemon/historydaemon.h (+11/-0)
daemon/historyservicedbus.cpp (+0/-30)
daemon/historyservicedbus.h (+0/-8)
plugins/sqlite/sqlitehistoryplugin.cpp (+5/-5)
plugins/sqlite/sqlitehistoryplugin.h (+1/-1)
plugins/sqlite/sqlitehistorythreadview.cpp (+226/-4)
plugins/sqlite/sqlitehistorythreadview.h (+28/-1)
src/PluginThreadView.xml (+28/-0)
src/contactmatcher.cpp (+9/-1)
src/pluginthreadview.cpp (+19/-1)
src/pluginthreadview.h (+11/-2)
src/thread.cpp (+13/-4)
src/thread.h (+1/-0)
src/threadview.cpp (+25/-15)
src/threadview.h (+3/-3)
src/threadview_p.h (+6/-3)
To merge this branch: bzr merge lp://staging/~phablet-team/history-service/thread_search_model
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+286656@code.staging.launchpad.net

Commit message

Add search capabilities to the thread models.

Description of the change

Add search capabilities to the thread models.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:230
http://jenkins.qa.ubuntu.com/job/history-service-ci/322/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/160
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/161
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/161/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/160

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/322/rebuild

review: Approve (continuous-integration)
Reply
lp://staging/~phablet-team/history-service/thread_search_model updated
231. By Gustavo Pichorim Boiko

Fix the interaction with the cached thread grouping.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:231
http://jenkins.qa.ubuntu.com/job/history-service-ci/323/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/162
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/162/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/161

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/323/rebuild

review: Approve (continuous-integration)
Reply
lp://staging/~phablet-team/history-service/thread_search_model updated
232. By Gustavo Pichorim Boiko

Instead of having NextPage() as virtual directly, add a fetchNextPage() virtual
function so that we can use NextPage to preprocess the results.

233. By Gustavo Pichorim Boiko

Revert the approach: the grouping will have to be implemented in the plugin itself.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:233
http://jenkins.qa.ubuntu.com/job/history-service-ci/324/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/162/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/163/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/162/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/324/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp://staging/~phablet-team/history-service/thread_search_model updated
234. By Gustavo Pichorim Boiko

Start implementing the grouping all in server side.

235. By Gustavo Pichorim Boiko

Emit the signals in the manager itself so that they can be used in the views.

236. By Gustavo Pichorim Boiko

Make it possible to handle thread changes in the server side view.

237. By Gustavo Pichorim Boiko

Get the signals from the thread view itself and not from the manager as
it will have the threads already filtered.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:237
http://jenkins.qa.ubuntu.com/job/history-service-ci/325/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/163/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/164/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/163/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/325/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp://staging/~phablet-team/history-service/thread_search_model updated
238. By Gustavo Pichorim Boiko

Start to add code to handle thread changes in the server side of the thread view.
Also fix the SqlitePluginTest.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:238
http://jenkins.qa.ubuntu.com/job/history-service-ci/326/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/164/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/165/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/164/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/326/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp://staging/~phablet-team/history-service/thread_search_model updated
239. By Gustavo Pichorim Boiko

Fix ContactMatcher.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:239
http://jenkins.qa.ubuntu.com/job/history-service-ci/327/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/165/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/166/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/165/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/327/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp://staging/~phablet-team/history-service/thread_search_model updated
240. By Gustavo Pichorim Boiko

Fix parsing grouped threads.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:240
http://jenkins.qa.ubuntu.com/job/history-service-ci/328/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/166/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/167/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/166/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/328/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp://staging/~phablet-team/history-service/thread_search_model updated
241. By Gustavo Pichorim Boiko

Implement the group updating.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:241
http://jenkins.qa.ubuntu.com/job/history-service-ci/329/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/167/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/168/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/167/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/329/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp://staging/~phablet-team/history-service/thread_search_model updated
242. By Gustavo Pichorim Boiko

Fix the dbus connection of signals.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:242
http://jenkins.qa.ubuntu.com/job/history-service-ci/330/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/168/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/169/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/168/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/330/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp://staging/~phablet-team/history-service/thread_search_model updated
243. By Gustavo Pichorim Boiko

Handle thread removing and adding.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:243
http://jenkins.qa.ubuntu.com/job/history-service-ci/331/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/169/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/170/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/169/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/331/rebuild

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:243
https://jenkins.canonical.com/system-apps/job/lp-history-service-ci/1/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/530/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/530
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/521
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/521
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/517/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/517/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/517/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/517/console
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/517/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/517/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/517/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-history-service-ci/1/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp://staging/~phablet-team/history-service/thread_search_model updated
244. By Gustavo Pichorim Boiko

Merge trunk

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:244
https://jenkins.canonical.com/system-apps/job/lp-history-service-ci/36/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2289/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2292
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2117/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2117/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2117/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2117/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2117/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2117/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/2117/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2117/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2117/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-history-service-ci/36/rebuild

review: Needs Fixing (continuous-integration)
Reply

Unmerged revisions

244. By Gustavo Pichorim Boiko

Merge trunk

243. By Gustavo Pichorim Boiko

Handle thread removing and adding.

242. By Gustavo Pichorim Boiko

Fix the dbus connection of signals.

241. By Gustavo Pichorim Boiko

Implement the group updating.

240. By Gustavo Pichorim Boiko

Fix parsing grouped threads.

239. By Gustavo Pichorim Boiko

Fix ContactMatcher.

238. By Gustavo Pichorim Boiko

Start to add code to handle thread changes in the server side of the thread view.
Also fix the SqlitePluginTest.

237. By Gustavo Pichorim Boiko

Get the signals from the thread view itself and not from the manager as
it will have the threads already filtered.

236. By Gustavo Pichorim Boiko

Make it possible to handle thread changes in the server side view.

235. By Gustavo Pichorim Boiko

Emit the signals in the manager itself so that they can be used in the views.

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: