Commit 309ba759 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Merged 72bfe08c136bcbbf80e608d1505594e559ad4532

parent 78bacb30
......@@ -88,7 +88,7 @@ if ($feedback) {
'name' => display_name($record->author),
'date' => format_date(strtotime($record->ctime), 'strftimedate'),
'message' => $record->message,
'public' => $record->public
'ispublic' => $record->public
);
if (!empty($record->attachment)) {
$d['attachid'] = $record->attachment;
......
......@@ -125,13 +125,14 @@ $getstring['addtowatchlist'] = "'" . get_string('addtowatchlist', 'mahara', get_
$getstring['addtowatchlistwithchildren'] = "'" . get_string('addtowatchlistwithchildren', 'mahara', ucfirst(get_string($thing))) . "'";
$getstring['feedbackattachmessage'] = "'(" . get_string('feedbackattachmessage', 'mahara', get_string('feedbackattachdirname')) . ")'";
// Safari doesn't seem to like these inputs to be called 'public', so call them 'ispublic' instead.
if (!empty($feedbackisprivate)) {
$makepublic = "TR(null, INPUT({'type':'hidden','name':'public','value':false}), TD({'colspan':2}, "
$makepublic = "TR(null, INPUT({'type':'hidden','name':'ispublic','value':'false'}), TD({'colspan':2}, "
. $getstring['feedbackonthisartefactwillbeprivate'] . ")),";
}
else {
$makepublic = "TR(null, TH(null, LABEL(null, " . $getstring['makepublic'] . " ), "
. "INPUT({'type':'checkbox', 'class':'checkbox', 'name':'public'}))),";
. "INPUT({'type':'checkbox', 'class':'checkbox', 'name':'ispublic'}))),";
}
$javascript = <<<EOF
......@@ -156,8 +157,8 @@ function feedbackform() {
}
else {
var data = {'view':view,
'message':form.message.value,
'public':form.public.checked};
'public':form.ispublic.checked,
'message':form.message.value};
if (artefact) {
data.artefact = artefact;
}
......@@ -255,7 +256,7 @@ var feedbacklist = new TableRenderer(
'name',
'date',
function (r) {
if (r.public == 1) {
if (r.ispublic == 1) {
var makePrivate = null;
if (r.ownedbythisuser) {
makePrivate = A({'href': ''}, get_string('makeprivate'));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment