Do Plugins

Merge lp://qastaging/~jpds/do-plugins/rtm-empty-url-fix into lp://qastaging/do-plugins

  1. rtm-empty-url-fix
  2. Merge into trunk
Proposed by Jonathan Davies
Status: Merged
Merged at revision: 583
Proposed branch: lp://qastaging/~jpds/do-plugins/rtm-empty-url-fix
Merge into: lp://qastaging/do-plugins
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~jpds/do-plugins/rtm-empty-url-fix
Reviewer Review Type Date Requested Status
Peng Deng Pending
Do Plugins Team Pending
Review via email: mp+4634@code.qastaging.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'RememberTheMilk/src/RTM.cs'
2--- RememberTheMilk/src/RTM.cs 2009-03-18 14:46:00 +0000
3+++ RememberTheMilk/src/RTM.cs 2009-03-18 18:45:13 +0000
4@@ -524,7 +524,7 @@
5
6 if (!string.IsNullOrEmpty(url)) {
7 ActionRoutine (Catalog.GetString ("Task URL Set"),
8- Catalog.GetString ("The selected task has been assigned an URL."),
9+ Catalog.GetString ("The selected task has been assigned a URL."),
10 taskId, listId);
11 } else {
12 ActionRoutine (Catalog.GetString ("Task URL Reset"),
13
14=== modified file 'RememberTheMilk/src/RTMSetUrl.cs'
15--- RememberTheMilk/src/RTMSetUrl.cs 2009-03-18 14:46:00 +0000
16+++ RememberTheMilk/src/RTMSetUrl.cs 2009-03-18 18:45:13 +0000
17@@ -97,6 +97,11 @@
18 url = ((modifierItems.FirstOrDefault() as ITextItem).Text);
19 }
20
21+ // User may have entered explicit mode and entered a blank line.
22+ // To be safe; strip out all new line characters from input
23+ // for URL resetting.
24+ url = url.Replace("\n", "");
25+
26 // The URL set to the task may be reset if the entered text is empty.
27 // Check if it's not empty.
28 if (!string.IsNullOrEmpty(url)) {
29@@ -109,7 +114,7 @@
30 }
31 }
32
33- Services.Application.RunOnThread (() => {
34+ Services.Application.RunOnThread (() => {
35 RTM.SetURL ((items.First () as RTMTaskItem).ListId,
36 (items.First () as RTMTaskItem).TaskSeriesId,
37 (items.First () as RTMTaskItem).Id, url);

Subscribers

People subscribed via source and target branches