diff --git a/app/models/course_message.rb b/app/models/course_message.rb index 07bfb22de..703da936b 100644 --- a/app/models/course_message.rb +++ b/app/models/course_message.rb @@ -15,7 +15,7 @@ class CourseMessage < ActiveRecord::Base validates :course_id,presence: true validates :course_message_id,presence: true validates :course_message_type, presence: true - validates_length_of :content, :maximum => 100 + #validates_length_of :content, :maximum => 100 after_create :add_user_message def add_user_message diff --git a/app/views/users/_apply_homework.html.erb b/app/views/users/_apply_homework.html.erb index 9f909b7a4..cd906fc8f 100644 --- a/app/views/users/_apply_homework.html.erb +++ b/app/views/users/_apply_homework.html.erb @@ -1,27 +1,16 @@
- \ No newline at end of file + \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index e058e72d0..afefc9e3c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -516,7 +516,7 @@ RedmineApp::Application.routes.draw do match 'user_project_activities', :to => 'users#user_project_activities', :via => :get match 'user_feedback4show', :to => 'users#user_feedback4show', :via => :get match 'user_visitorlist', :to => 'users#user_visitorlist', :via => :get - match 'apply_for_homework', :to => 'users#apply_for_homework', :via => :get + match 'apply_for_homework', :to => 'users#apply_for_homework', :via => :post match 'apply_homework', :to => 'users#apply_homework', :via => :get match 'user_homeworks', :to => 'users#user_homeworks', :via => :get match 'student_homeworks', :to => 'users#student_homeworks', :via => :get @@ -583,6 +583,7 @@ RedmineApp::Application.routes.draw do get 'user_homework_type' get 'user_ref_homework_search' get 'show_homework_detail' + post 'apply_for_homework' # end end #resources :blogs diff --git a/db/migrate/20160506104128_change_course_messages_cloumn.rb b/db/migrate/20160506104128_change_course_messages_cloumn.rb new file mode 100644 index 000000000..39e882b39 --- /dev/null +++ b/db/migrate/20160506104128_change_course_messages_cloumn.rb @@ -0,0 +1,8 @@ +class ChangeCourseMessagesCloumn < ActiveRecord::Migration + def up + change_column :course_messages, :content, :text + end + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index 4e44a2638..3ffa35872 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20160429030819) do +ActiveRecord::Schema.define(:version => 20160506104128) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -485,7 +485,7 @@ ActiveRecord::Schema.define(:version => 20160429030819) do t.integer "viewed" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false - t.string "content" + t.text "content" t.integer "status" t.integer "apply_user_id" t.integer "apply_result"