From c31287f2f528332e73e4af4972c22dd3bb72a02f Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 21 Nov 2016 15:21:51 +0800
Subject: [PATCH] =?UTF-8?q?temp=E7=94=A8=E6=88=B7=EF=BC=8C=E9=93=83?=
=?UTF-8?q?=E9=93=9B=E6=B6=88=E6=81=AF=E6=8A=A5500=EF=BC=8C=E5=B9=B6?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=82=B9=E5=87=BB=E5=90=8D=E7=A7=B0=E8=BF=9B?=
=?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=EF=BC=88=E7=9B=AE=E5=89=8D?=
=?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=B1=BB=E6=B6=88=E6=81=AF=E7=82=B9=E5=87=BB?=
=?UTF-8?q?=E8=BF=9B=E8=87=AA=E5=B7=B1=E4=B8=BB=E9=A1=B5=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../_user_message_applied_schools.html.erb | 2 +-
app/views/users/_user_message_course.html.erb | 11 +++++--
app/views/users/user_messages.html.erb | 1 +
...0161121063025_delete_temp_error_message.rb | 12 +++++++
db/schema.rb | 32 ++++++++-----------
5 files changed, 37 insertions(+), 21 deletions(-)
create mode 100644 db/migrate/20161121063025_delete_temp_error_message.rb
diff --git a/app/views/users/_user_message_applied_schools.html.erb b/app/views/users/_user_message_applied_schools.html.erb
index 9de70a03a..1e2ff86ba 100644
--- a/app/views/users/_user_message_applied_schools.html.erb
+++ b/app/views/users/_user_message_applied_schools.html.erb
@@ -2,6 +2,6 @@
<% if ma.status != 0 %>
系统提示
<% else %>
- <%=link_to User.where("id=?", ma.applied_user_id).first.show_name, user_path(ma.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+ <%=link_to User.where("id=?", ma.applied_user_id).first.show_name, user_path(ma.applied_user_id), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
<% end %>
"><%= applied_school_tip(ma) %>
\ No newline at end of file
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 40f25d429..3520bf529 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -1,8 +1,15 @@
<% if ma.class == CourseMessage %>
<% if ma.course_message_type == "News" && ma.course_message %>
- - <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author), :target => '_blank' %>
- - <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>">发布了通知：
+ -
+
+ <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author), :target => '_blank' %>
+
+
+ -
+ <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+ ">发布了通知：
+
-
<%= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id },
:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 2baa9f2f2..b1ae0aff2 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -87,3 +87,4 @@
+
diff --git a/db/migrate/20161121063025_delete_temp_error_message.rb b/db/migrate/20161121063025_delete_temp_error_message.rb
new file mode 100644
index 000000000..7e5063be5
--- /dev/null
+++ b/db/migrate/20161121063025_delete_temp_error_message.rb
@@ -0,0 +1,12 @@
+class DeleteTempErrorMessage < ActiveRecord::Migration
+ def up
+ Organization.where(:id => 68).update_all(:name => "blankname")
+ MessageAll.where(:message_id => 171).destroy_all
+ OrgMessage.where(:id => 171).destroy_all
+ MessageAll.where(:message_id => 16).destroy_all
+ OrgMessage.where(:id => 16).destroy_all
+ end
+
+ def down
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2739d5dcd..5e5833771 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -996,6 +996,19 @@ ActiveRecord::Schema.define(:version => 20161117060138) do
t.datetime "updated_at", :null => false
end
+ create_table "ii", :force => true do |t|
+ t.integer "project_id"
+ t.string "author_login"
+ t.string "rep_identifier"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ t.integer "sonar_version", :default => 0
+ t.string "path"
+ t.string "branch"
+ t.string "language"
+ t.string "sonar_name"
+ end
+
create_table "innodb_monitor", :id => false, :force => true do |t|
t.integer "a"
end
@@ -1587,6 +1600,7 @@ ActiveRecord::Schema.define(:version => 20161117060138) do
t.boolean "hidden_repo", :default => false, :null => false
t.integer "attachmenttype", :default => 1
t.integer "user_id"
+ t.integer "dts_test", :default => 0
t.string "enterprise_name"
t.integer "organization_id"
t.integer "project_new_type"
@@ -1594,11 +1608,6 @@ ActiveRecord::Schema.define(:version => 20161117060138) do
t.integer "forked_from_project_id"
t.integer "forked_count"
t.integer "publish_resource", :default => 0
- t.integer "boards_count", :default => 0
- t.integer "news_count", :default => 0
- t.integer "acts_count", :default => 0
- t.integer "journals_count", :default => 0
- t.integer "boards_reply_count", :default => 0
t.integer "visits", :default => 0
t.integer "hot", :default => 0
t.string "invite_code"
@@ -1625,19 +1634,6 @@ ActiveRecord::Schema.define(:version => 20161117060138) do
t.datetime "updated_at", :null => false
end
- create_table "quality_analyses", :force => true do |t|
- t.integer "project_id"
- t.string "author_login"
- t.string "rep_identifier"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
- t.integer "sonar_version", :default => 0
- t.string "path"
- t.string "branch"
- t.string "language"
- t.string "sonar_name"
- end
-
create_table "queries", :force => true do |t|
t.integer "project_id"
t.string "name", :default => "", :null => false