← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~gary-wzl77/ubuntu-calendar-app/add_prefix into lp:ubuntu-calendar-app

 

Gary.Wang has proposed merging lp:~gary-wzl77/ubuntu-calendar-app/add_prefix into lp:ubuntu-calendar-app.

Commit message:
Add prefix for event id parsing.

Requested reviews:
  Alan Pope  (popey)
Related bugs:
  Bug #1474361 in Ubuntu Calendar App: "ubuntu touch today scope: Bad integration to calendar app"
  https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1474361

For more details, see:
https://code.launchpad.net/~gary-wzl77/ubuntu-calendar-app/add_prefix/+merge/267317

Add prefix for event id parsing.

For Bug #1474361, 
Lost prefix for event id parsing results in calendar can't navigate to event details page.
If the dispatch url in event scope is "calendar:///qtorganizer:eds::system-calendar/eventId=%1", it's invalid.
-- 
Your team Ubuntu Calendar Developers is subscribed to branch lp:ubuntu-calendar-app.
=== modified file 'calendar.qml'
--- calendar.qml	2015-06-11 12:29:28 +0000
+++ calendar.qml	2015-08-07 09:59:30 +0000
@@ -99,12 +99,16 @@
         target: UriHandler
         onOpened: {
             var uri = uris[0]
-            if(uri !== undefined && url != "") {
+            if(uri !== undefined && uri !== "") {
                 var commands = uri.split("://")[1].split("=");
                 if(commands[0].toLowerCase() === "eventid") {
                     // calendar://eventid=??
                     if( eventModel ) {
-                        eventModel.showEventFromId(commands[1]);
+                        var prefix = "qtorganizer:eds::system-calendar/";
+                        if (commands[1].indexOf(prefix) !== 0)
+                            eventModel.showEventFromId(prefix + commands[1]);
+                        else
+                            eventModel.showEventFromId(commands[1]);
                     }
                 }
             }


Follow ups