diff --git a/app/controllers/system_messages_controller.rb b/app/controllers/system_messages_controller.rb index 42291a407..5ba04241c 100644 --- a/app/controllers/system_messages_controller.rb +++ b/app/controllers/system_messages_controller.rb @@ -38,14 +38,14 @@ class SystemMessagesController < ApplicationController return end @system_messages = SystemMessage.new - @system_messages.content = params[:system_message][:content] + @system_messages.description = params[:system_message][:description] @system_messages.user_id = User.current.id respond_to do |format| if @system_messages.save format.html {redirect_to user_message_path(User.current, :type => "system_messages")} flash[:notice] = l(:notice_successful_message) else - if params[:system_message][:content].empty? + if params[:system_message][:description].empty? flash[:error] = l(:label_content_blank_fail) else flash[:error] = l(:label_admin_message_fail) diff --git a/app/models/system_message.rb b/app/models/system_message.rb index 92a989cb3..3430bea5f 100644 --- a/app/models/system_message.rb +++ b/app/models/system_message.rb @@ -1,7 +1,7 @@ class SystemMessage < ActiveRecord::Base - attr_accessible :content, :id, :user_id + attr_accessible :content, :id, :user_id, :description belongs_to :user - validates :content, presence: true - validates_length_of :content, maximum: 255 + validates :description, presence: true + validates_length_of :description, maximum: 10000 end diff --git a/app/views/admin/messages.html.erb b/app/views/admin/messages.html.erb index 10169f30b..cd28b09a8 100644 --- a/app/views/admin/messages.html.erb +++ b/app/views/admin/messages.html.erb @@ -5,7 +5,7 @@