From a7f1026828e0ad3b2b64cb77e6c59f5313e0d12d Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 15 Apr 2015 10:30:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?current=5Fuser=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/courses_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb index a96bc0fbe..aa216d755 100644 --- a/app/services/courses_service.rb +++ b/app/services/courses_service.rb @@ -345,7 +345,7 @@ class CoursesService def course_dynamic(params,current_user) @user = User.find(params[:id]) - if !current_user.admin? && !@user.active? + if current_user.nil? && !current_user.admin? && !@user.active? raise '404' return end From c42a63ea4e6957f3c61ef51ce1772c8bf0e778bc Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 15 Apr 2015 10:52:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/mobile/entities/user.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/mobile/entities/user.rb b/app/api/mobile/entities/user.rb index 1f52ae841..9112e7ec5 100644 --- a/app/api/mobile/entities/user.rb +++ b/app/api/mobile/entities/user.rb @@ -15,13 +15,13 @@ module Mobile when :img_url url_to_avatar(u) when :gender - u.user_extensions.gender.nil? ? 0 : u.user_extensions.gender + u.nil? || u.user_extensions.nil? || u.user_extensions.gender.nil? ? 0 : u.user_extensions.gender when :work_unit get_user_work_unit u when :location get_user_location u when :brief_introduction - u.user_extensions.brief_introduction + u.nil? || u.user_extensions.nil? ? "" : u.user_extensions.brief_introduction end end end From b13d30bf20b04bd26c4338baa77230b346f530c5 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 15 Apr 2015 10:52:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/schema.rb | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index a8ade8ed0..ae76b3141 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -654,6 +654,16 @@ ActiveRecord::Schema.define(:version => 20150402015402) do add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id" + create_table "journal_details_copy", :force => true do |t| + t.integer "journal_id", :default => 0, :null => false + t.string "property", :limit => 30, :default => "", :null => false + t.string "prop_key", :limit => 30, :default => "", :null => false + t.text "old_value" + t.text "value" + end + + add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id" + create_table "journal_replies", :id => false, :force => true do |t| t.integer "journal_id" t.integer "user_id" @@ -1075,12 +1085,12 @@ ActiveRecord::Schema.define(:version => 20150402015402) do end create_table "roles", :force => true do |t| - t.string "name", :limit => 30, :default => "", :null => false - t.integer "position", :default => 1 - t.boolean "assignable", :default => true - t.integer "builtin", :default => 0, :null => false + t.string "name", :limit => 90 + t.integer "position" + t.boolean "assignable" + t.integer "builtin" t.text "permissions" - t.string "issues_visibility", :limit => 30, :default => "default", :null => false + t.string "issues_visibility", :limit => 90 end create_table "schools", :force => true do |t| From 11c1bbb525b7e7e83f66ad6dddc89057245a52b7 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Wed, 15 Apr 2015 11:24:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=97=B6=E6=96=87=E4=BB=B6=E8=BF=87=E5=A4=9A=E6=8F=92=E5=BA=93?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20150415032102_change_file_digests.rb | 9 +++++++ db/schema.rb | 24 ++++++------------- 2 files changed, 16 insertions(+), 17 deletions(-) create mode 100644 db/migrate/20150415032102_change_file_digests.rb diff --git a/db/migrate/20150415032102_change_file_digests.rb b/db/migrate/20150415032102_change_file_digests.rb new file mode 100644 index 000000000..a8fe5febf --- /dev/null +++ b/db/migrate/20150415032102_change_file_digests.rb @@ -0,0 +1,9 @@ +class ChangeFileDigests < ActiveRecord::Migration + def up + change_column :zip_packs, :file_digests, :text + end + + def down + change_column :zip_packs, :file_digests, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index ae76b3141..e4c11e8ce 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 => 20150402015402) do +ActiveRecord::Schema.define(:version => 20150415032102) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -654,16 +654,6 @@ ActiveRecord::Schema.define(:version => 20150402015402) do add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id" - create_table "journal_details_copy", :force => true do |t| - t.integer "journal_id", :default => 0, :null => false - t.string "property", :limit => 30, :default => "", :null => false - t.string "prop_key", :limit => 30, :default => "", :null => false - t.text "old_value" - t.text "value" - end - - add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id" - create_table "journal_replies", :id => false, :force => true do |t| t.integer "journal_id" t.integer "user_id" @@ -1085,12 +1075,12 @@ ActiveRecord::Schema.define(:version => 20150402015402) do end create_table "roles", :force => true do |t| - t.string "name", :limit => 90 - t.integer "position" - t.boolean "assignable" - t.integer "builtin" + t.string "name", :limit => 30, :default => "", :null => false + t.integer "position", :default => 1 + t.boolean "assignable", :default => true + t.integer "builtin", :default => 0, :null => false t.text "permissions" - t.string "issues_visibility", :limit => 90 + t.string "issues_visibility", :limit => 30, :default => "default", :null => false end create_table "schools", :force => true do |t| @@ -1468,7 +1458,7 @@ ActiveRecord::Schema.define(:version => 20150402015402) do t.string "file_path" t.integer "pack_times", :default => 1 t.integer "pack_size", :default => 0 - t.string "file_digests" + t.text "file_digests" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false end