Owen Leonard
ce038936d1
This patch addresses on aspect of Bug 8617: The behavior where live previews of edited comments are displaying on opac-detail as a duplicate comment. We must pass the review id back to the script when submitting so that the check for it will evaluate as true when it should. This patch also corrects some JavaScript for translatability. To test, submit a comment on a title and approve it. Return to the title and edit the comment. When you submit your revised comment the comment pop-up window should close and your revised comment should appear on opac-detail as "pending approval." Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
79 lines
3.7 KiB
Text
79 lines
3.7 KiB
Text
[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog › Comments on [% title %]
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
<style type="text/css">
|
|
#custom-doc { width:37.08em;*width:36.16em;min-width:485px; margin:1em auto; text-align:left; }
|
|
</style>
|
|
<script type="text/JavaScript" language="JavaScript">
|
|
//<![CDATA[
|
|
$(document).ready(function() {
|
|
var inject_old = function(comment) {
|
|
[% IF ( reviewid ) %]
|
|
[% IF ( cgi_debug ) %]alert(_('injecting OLD comment: ')+comment);[% END %]
|
|
parent.opener.$('#c[% reviewid %] p').prev("small").prev("h5").html(_("Your edited comment (preview, pending approval)"));
|
|
parent.opener.$('#c[% reviewid %] p').html(comment);
|
|
parent.opener.$('#c[% reviewid %] p').append(" <a href=\"#comment\" onclick=\"Dopop(\'/cgi-bin/koha/opac-review.pl?biblionumber=[% biblionumber | uri %]&reviewid=[% reviewid | uri%]\');\">"+_("Edit")+"<\/a>");
|
|
[% END %]
|
|
return 1;
|
|
};
|
|
var inject_new = function(comment) {
|
|
[% IF ( cgi_debug ) %]alert(_("injecting NEW comment: ") +comment);[% END %]
|
|
parent.opener.$('#newcomment').attr("class","yours");
|
|
parent.opener.$('#newcomment').html(
|
|
"<h5>" + _("Your comment (preview, pending approval)") + "<\/h5>" +
|
|
"<p>"+comment+"<\/p>" +
|
|
"<a href=\"#comment\" onclick=\"Dopop(\'/cgi-bin/koha/opac-review.pl?biblionumber=[% biblionumber |uri%]\');\">"+_("Edit")+"<\/a><\/p>"
|
|
);
|
|
parent.opener.$("#addcomment").prev("p").remove();
|
|
parent.opener.$("#addcomment").remove();
|
|
};
|
|
[% IF ( clean_review ) %]
|
|
var clean_review = "[% clean_review |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; // TMPL var must not contain " quotes.
|
|
[% IF ( reviewid ) %]
|
|
inject_old(clean_review);
|
|
[% ELSE %]
|
|
inject_new(clean_review);
|
|
[% END %]
|
|
[% END %]
|
|
[% IF ( WINDOW_CLOSE ) %]
|
|
[% IF ( ERRORS ) %]
|
|
setTimeout("window.close()",5000); // flash this page, then close. Change warning in template if you change this value.
|
|
[% ELSE %]
|
|
window.close();
|
|
[% END %]
|
|
[% END %]
|
|
});
|
|
//]]>
|
|
</script>
|
|
</head>
|
|
<body id="comment">
|
|
<div id="custom-doc" class="yui-t7">
|
|
<div id="userreview" class="container">
|
|
[% IF ( cgi_debug ) %]<div class="debug">CGI debug is on.</div>[% END %]
|
|
[% IF ( ERRORS ) %]
|
|
<div class="dialog alert">
|
|
[% FOREACH ERROR IN ERRORS %]
|
|
<p>
|
|
[% IF ( ERROR.scrubbed ) %]Note: your comment contained illegal markup code.
|
|
It has been saved with the markup removed, as below.
|
|
You can edit the comment further, or cancel to retain the comment as is.
|
|
[% END %]
|
|
[% IF ( ERROR.scrubbed_all ) %]Error! Your comment was entirely illegal markup code. It has NOT been added.[% END %]
|
|
[% IF ( ERROR.empty ) %]Error! You cannot add an empty comment. Please add content or cancel.[% END %]
|
|
</p>
|
|
[% END %]
|
|
[% IF ( WINDOW_CLOSE ) %]Note: this window will close automatically in 5 seconds[% END %]
|
|
</div>
|
|
[% END %]
|
|
<form id="reviewf" action="/cgi-bin/koha/opac-review.pl[% IF ( cgi_debug ) %]?debug=1[% END %]" method="post">
|
|
<input type="hidden" name="biblionumber" value="[% biblionumber | html%]" />
|
|
[% IF ( reviewid ) %]<input type="hidden" name="reviewid" value="[% reviewid | html%]" />[% END %]
|
|
<fieldset class="brief">
|
|
<legend>Comments on <i>[% title |html %] [% subtitle %]</i>[% IF ( author ) %]by [% author %][% END %]</legend>
|
|
<ol><li><textarea id="review" name="review" cols="60" rows="8">[% review %]</textarea></li></ol>
|
|
</fieldset>
|
|
<p>Note: Your comment must be approved by a librarian. </p>
|
|
<fieldset class="action"> <input type="submit" value="Submit and close this window" /> <a class="cancel close" href="#">Cancel</a></fieldset>
|
|
</form></div>
|
|
</div>
|
|
</body>
|
|
</html>
|