summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authormkanat%bugzilla.org <>2007-11-13 06:15:06 +0100
committermkanat%bugzilla.org <>2007-11-13 06:15:06 +0100
commit8db452b3d757978ff7166dc229bdb4ebfbd1bdc7 (patch)
treee57810082f11412d1a2d13118bb9c87e2a39804b /template
parentd5adbc109d44481c9c4b7ba6429cbbc35487486e (diff)
downloadbugzilla-8db452b3d757978ff7166dc229bdb4ebfbd1bdc7.tar.gz
bugzilla-8db452b3d757978ff7166dc229bdb4ebfbd1bdc7.tar.xz
Bug 401957: Move comment "isprivate" updating from process_bug to Bugzilla::Bug
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=LpSolit
Diffstat (limited to 'template')
-rw-r--r--template/en/default/bug/comments.html.tmpl12
-rw-r--r--template/en/default/filterexceptions.pl3
-rw-r--r--template/en/default/global/user-error.html.tmpl4
3 files changed, 11 insertions, 8 deletions
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 895ab5306..7a0020d47 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -191,14 +191,14 @@
[% IF mode == "edit" && isinsider %]
<i>
- <input type="hidden" name="oisprivate-[% count %]"
- value="[% comment.isprivate %]">
- <input type="hidden" name="when-[% count %]" value="[% comment.time %]">
- <input type="checkbox" name="isprivate-[% count %]" value="1"
+ <input type="hidden" value="1"
+ name="defined_isprivate_[% comment.id %]">
+ <input type="checkbox"
+ name="isprivate_[% comment.id %]" value="1"
+ id="isprivate_[% comment.id %]"
onClick="updateCommentPrivacy(this, [% count %])"
- id="isprivate-[% count %]"
[% " checked=\"checked\"" IF comment.isprivate %]>
- <label for="isprivate-[% count %]">Private</label>
+ <label for="isprivate_[% comment.id %]">Private</label>
</i>
[% END %]
[% IF user.in_group(Param('timetrackinggroup')) &&
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 1ae80430a..80957e6c7 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -275,8 +275,7 @@
],
'bug/comments.html.tmpl' => [
- 'comment.isprivate',
- 'comment.time',
+ 'comment.id',
'bug.bug_id',
],
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 16bc0f7af..b0c087530 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -246,6 +246,10 @@
[% title = "Chart Too Large" %]
Sorry, but 2000 x 2000 is the maximum size for a chart.
+ [% ELSIF error == "comment_invalid_isprivate" %]
+ You tried to modify the privacy of comment id [% id FILTER html %],
+ but that is not a valid comment on this [% terms.bug %].
+
[% ELSIF error == "comment_required" %]
[% title = "Comment Required" %]
You have to specify a <b>comment</b>