summaryrefslogtreecommitdiffstats
path: root/app/views/messages
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-01-13 18:33:55 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-01-13 18:33:55 +0000
commit8b710cf9de899eb31fb6759f72606d5d3ae4bffc (patch)
tree99805e4f023b3914d7ab4c8b556359743b70520e /app/views/messages
parentdf30e18a8cfcec42c660acb0a8567489f60c8941 (diff)
downloadredmine-8b710cf9de899eb31fb6759f72606d5d3ae4bffc.tar.gz
redmine-8b710cf9de899eb31fb6759f72606d5d3ae4bffc.zip
Do not show sticky and locked checkboxes when replying to a message.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1062 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/messages')
-rw-r--r--app/views/messages/_form.rhtml3
-rw-r--r--app/views/messages/show.rhtml2
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/messages/_form.rhtml b/app/views/messages/_form.rhtml
index c2f7fb569..aa0355070 100644
--- a/app/views/messages/_form.rhtml
+++ b/app/views/messages/_form.rhtml
@@ -1,11 +1,12 @@
<%= error_messages_for 'message' %>
+<% replying ||= false %>
<div class="box">
<!--[form:message]-->
<p><label><%= l(:field_subject) %></label><br />
<%= f.text_field :subject, :required => true, :size => 120 %>
-<% if User.current.allowed_to?(:edit_messages, @project) %>
+<% if !replying && User.current.allowed_to?(:edit_messages, @project) %>
<label><%= f.check_box :sticky %> Sticky</label>
<label><%= f.check_box :locked %> Locked</label>
<% end %>
diff --git a/app/views/messages/show.rhtml b/app/views/messages/show.rhtml
index bb7e2b7f3..7d4c9989e 100644
--- a/app/views/messages/show.rhtml
+++ b/app/views/messages/show.rhtml
@@ -32,7 +32,7 @@
<p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></p>
<div id="reply" style="display:none;">
<% form_for :reply, @reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true} do |f| %>
- <%= render :partial => 'form', :locals => {:f => f} %>
+ <%= render :partial => 'form', :locals => {:f => f, :replying => true} %>
<%= submit_tag l(:button_submit) %>
<% end %>
</div>