diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb index 1e537ff75..aad575ee5 100644 --- a/app/controllers/memos_controller.rb +++ b/app/controllers/memos_controller.rb @@ -62,7 +62,7 @@ class MemosController < ApplicationController format.html { redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}" } format.json { render json: @memo, status: :created, location: @memo } else - flash[:error] = "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}" + flash.now[:error] = "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}" # back_error_page = @memo.parent_id.nil? ? forum_path(@forum) : forum_memo_path(@forum, @memo.parent_id) pre_count = REPLIES_PER_PAGE diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb index 8dafdf173..0856da976 100644 --- a/app/views/messages/_form.html.erb +++ b/app/views/messages/_form.html.erb @@ -3,44 +3,44 @@ <% replying ||= false %>
- - <% unless replying %> -

- <%= f.text_field :subject, :size => 60, :style => "width: 99%;display:none;", :id => "message_subject" %> -

- <% else %> -

- <%= f.text_field :subject, :size => 60, :style => "width: 99%;display:none;", :id => "message_subject", :readonly => true %> -

- <% end %> -

- <% unless replying %> - <% if @message.safe_attribute? 'sticky' %> + + <% unless replying %> +


+ <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject" %> +

+ <% else %> +


+ <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject", :readonly => true %> +

+ <% end %> +

+ <% unless replying %> + <% if @message.safe_attribute? 'sticky' %> <%= f.check_box :sticky %> <%= label_tag 'message_sticky', l(:label_board_sticky) %> - <% end %> - <% if @message.safe_attribute? 'locked' %> + <% end %> + <% if @message.safe_attribute? 'locked' %> <%= f.check_box :locked %> <%= label_tag 'message_locked', l(:label_board_locked) %> - <% end %> + <% end %> <% end %> -

-

-

+

+ -

- <%= text_area :quote,:quote,:style => 'display:none' %> -

-

- <%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %> - <%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content' %> -

+
+ <%= text_area :quote,:quote,:style => 'display:none' %> +

+

+ <%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %> + <%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content' %> +

- + -

- <%= l(:label_attachment_plural) %> -
- <%= render :partial => 'attachments/form_course', :locals => {:container => @message,:isReply => @isReply} %> -

+

+ <%= l(:label_attachment_plural) %> +
+ <%= render :partial => 'attachments/form_course', :locals => {:container => @message,:isReply => @isReply} %> +

diff --git a/config/routes.rb b/config/routes.rb index be65d0eb4..a6b3c5421 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -724,7 +724,7 @@ RedmineApp::Application.routes.draw do # added by young match 'calls', :to => 'bids#index' - match 'calls/:id', :to => 'bid#show', :as => 'respond' + match 'calls/:id', :to => 'bids#show', :as => 'respond' # modified by longjun # bids#contests is not exist # match 'contest', :to => 'bids#contests', :as => 'contest' #modified @20140403