OpenLP

Merge lp:~phill-ridout/openlp/ticket703+677 into lp:openlp

  1. ticket703+677
  2. Merge into trunk
Proposed by Phill
Status: Merged
Approved by: Tim Bentley
Approved revision: 1991
Merged at revision: 1995
Proposed branch: lp:~phill-ridout/openlp/ticket703+677
Merge into: lp:openlp
Diff against target: 13 lines (+3/-0)
1 file modified
openlp/plugins/remotes/html/openlp.js (+3/-0)
To merge this branch: bzr merge lp:~phill-ridout/openlp/ticket703+677
Reviewer Review Type Date Requested Status
Jonathan Corwin (community) Approve
Tim Bentley Approve
Review via email: mp+110642@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Phill (phill-ridout) wrote :

Probably should have said:

A fix for issues: http://support.openlp.org/issues/703
http://support.openlp.org/issues/677

The bug was being caused because we were passing file paths for images and
presentations. In windows a back slash is used. This needed escaping

In my merge proposal.
On Jun 16, 2012 1:22 AM, "phill" <email address hidden> wrote:

> phill has proposed merging lp:~phill-ridout/openlp/ticket703+677 into
> lp:openlp.
>
> Requested reviews:
> OpenLP Core (openlp-core)
>
> For more details, see:
> https://code.launchpad.net/~phill-ridout/openlp/ticket703+677/+merge/110642
> --
> https://code.launchpad.net/~phill-ridout/openlp/ticket703+677/+merge/110642
> You are the owner of lp:~phill-ridout/openlp/ticket703+677.
>
> === modified file 'openlp/plugins/remotes/html/openlp.js'
> --- openlp/plugins/remotes/html/openlp.js 2012-04-18 20:44:47 +0000
> +++ openlp/plugins/remotes/html/openlp.js 2012-06-16 00:21:19 +0000
> @@ -245,6 +245,9 @@
> }
> else {
> $.each(data.results.items, function (idx, value) {
> + if (typeof value[0] !== "number"){
> + value[0] = OpenLP.escapeString(value[0])
> + }
> ul.append($("<li>").append($("<a>").attr("href", "#options")
> .attr("data-rel", "dialog").attr("value", value[0])
> .click(OpenLP.showOptions).text(value[1])));
>
>
>

Revision history for this message
Tim Bentley (trb143) :
review: Approve
Revision history for this message
Jonathan Corwin (j-corwin) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/plugins/remotes/html/openlp.js'
2--- openlp/plugins/remotes/html/openlp.js 2012-04-18 20:44:47 +0000
3+++ openlp/plugins/remotes/html/openlp.js 2012-06-16 00:24:20 +0000
4@@ -245,6 +245,9 @@
5 }
6 else {
7 $.each(data.results.items, function (idx, value) {
8+ if (typeof value[0] !== "number"){
9+ value[0] = OpenLP.escapeString(value[0])
10+ }
11 ul.append($("<li>").append($("<a>").attr("href", "#options")
12 .attr("data-rel", "dialog").attr("value", value[0])
13 .click(OpenLP.showOptions).text(value[1])));