From c2020a9535a4e3288f5e16866bccf1193d9331d1 Mon Sep 17 00:00:00 2001 From: z9hang Date: Wed, 3 Sep 2014 16:13:50 +0800 Subject: [PATCH] =?UTF-8?q?=20#1097=20=E8=AE=A8=E8=AE=BA=E5=8C=BA=E7=9A=84?= =?UTF-8?q?=E5=9B=9E=E5=B8=96=E5=BC=95=E7=94=A8=E8=A7=A3=E6=9E=90=E5=92=8C?= =?UTF-8?q?=E7=BC=BA=E9=99=B7=E7=AD=89=E6=A8=A1=E5=9D=97=E4=B8=80=E8=87=B4?= =?UTF-8?q?=20=E8=A7=A3=E5=86=B3=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E3=80=81=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA=E5=8C=BA?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E7=9A=84=E8=A7=A3=E6=9E=90=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E4=B8=8E=E7=BC=BA=E9=99=B7=E4=B8=80=E8=87=B4=E7=94=B1=E4=BD=BF?= =?UTF-8?q?=E7=94=A8
=E6=94=B9=E5=9B=9E=E8=87=B3=E2=80=9C>=20>?= =?UTF-8?q?=E2=80=9D,=E4=BB=A5=E4=B8=8A=E4=B8=BA=E4=B8=A4=E7=A7=8D?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E7=BC=96=E8=BE=91=E5=99=A8=E7=9A=84=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/messages_controller.rb | 20 ++++++++--------- app/views/messages/_course_show.html.erb | 2 +- app/views/messages/_form.html.erb | 1 + app/views/messages/_project_show.html.erb | 2 +- db/schema.rb | 26 +++-------------------- 5 files changed, 16 insertions(+), 35 deletions(-) diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 44496c3d7..e1af9ca34 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -156,17 +156,17 @@ class MessagesController < ApplicationController @subject = @message.subject @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:') - #@content = "> #{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> " - #@temp = Message.new - ##@temp.content = "> #{ll(Setting.default_language, :text_user_wrote, @message.author)}> " - #@content << @message.content.to_s.strip.gsub(%r{
((.|\s)*?)
}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" - #@content_html = textilizable(@content) - #@temp.content = @content_html - @content = "#{ll(Setting.default_language, :text_user_wrote, @message.author)}
  " - @content << @message.content.to_s.strip.gsub(%r{
((.|\s)*?)
}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n") + "
\n\n
" - @content = "
" << @content + @content = "> #{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> " @temp = Message.new - @temp.content = @content + #@temp.content = "> #{ll(Setting.default_language, :text_user_wrote, @message.author)}> " + @content << @message.content.to_s.strip.gsub(%r{
((.|\s)*?)
}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" + @content_html = textilizable(@content) + @temp.content = @content_html + #@content = "#{ll(Setting.default_language, :text_user_wrote, @message.author)}
  " + #@content << @message.content.to_s.strip.gsub(%r{
((.|\s)*?)
}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n") + "
\n\n
" + #@content = "
" << @content + #@temp = Message.new + #@temp.content = @content end diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb index aba16d620..a11107a9b 100644 --- a/app/views/messages/_course_show.html.erb +++ b/app/views/messages/_course_show.html.erb @@ -157,7 +157,7 @@
- <%= textAreailizable message,:content,:attachments => message.attachments %> + <%= textilizable message,:content,:attachments => message.attachments %> <%#= message.content.html_safe %>
<%= link_to_attachments message, :author => false %> diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb index 047f7d660..c6e5bd686 100644 --- a/app/views/messages/_form.html.erb +++ b/app/views/messages/_form.html.erb @@ -34,6 +34,7 @@

<% end %>

+

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

diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb index ddb23fc95..eff5fa160 100644 --- a/app/views/messages/_project_show.html.erb +++ b/app/views/messages/_project_show.html.erb @@ -163,7 +163,7 @@

- <%= textAreailizable message,:content,:attachments => message.attachments %> + <%= textilizable message,:content,:attachments => message.attachments %> <%#= message.content.html_safe %>
<%= link_to_attachments message, :author => false %> diff --git a/db/schema.rb b/db/schema.rb index 1307dd913..db51ddd37 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -437,14 +437,14 @@ ActiveRecord::Schema.define(:version => 20140826072838) do t.string "web_title" t.string "title" t.text "description" + t.string "page_type" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false - t.string "page_type" t.integer "sort_type" - t.integer "show_course", :default => 1 - t.integer "show_contest", :default => 1 t.integer "image_width", :default => 107 t.integer "image_height", :default => 63 + t.integer "show_course", :default => 1 + t.integer "show_contest", :default => 1 end create_table "forums", :force => true do |t| @@ -458,26 +458,6 @@ ActiveRecord::Schema.define(:version => 20140826072838) do t.datetime "updated_at", :null => false end - create_table "gitlab_projects", :force => true do |t| - t.integer "gitlab_project_id" - t.integer "project_id" - t.string "repository_url" - t.string "web_url" - t.string "localfile_url" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "gitlab_users", :force => true do |t| - t.integer "gitlab_user_id" - t.integer "user_id" - t.string "email" - t.string "password" - t.string "login", :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - create_table "groups_users", :id => false, :force => true do |t| t.integer "group_id", :null => false t.integer "user_id", :null => false