From c9f6259587106d916601558ba03fc2cf37fa0d81 Mon Sep 17 00:00:00 2001 From: z9hang Date: Tue, 9 Sep 2014 11:58:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=E5=BA=93=E6=97=B6?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 2 +- app/controllers/welcome_controller.rb | 2 +- db/schema.rb | 12 +++++------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index d15036fa0..d479b8804 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -791,7 +791,7 @@ class UsersController < ApplicationController # 必填自己的工作单位，其实就是学校 def auth_user_extension - if @user == User.current && @user.user_extensions.school.nil? + if @user == User.current && (@user.user_extensions.nil? || @user.user_extensions.school.nil?) flash[:error] = l(:error_complete_occupation) redirect_to my_account_path end diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 641f02af7..8f0723f2e 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -64,7 +64,7 @@ class WelcomeController < ApplicationController @course_page = FirstPage.where("page_type = 'course'").first if params[:school_id] @school_id = params[:school_id] - elsif User.current.logged? && User.current.user_extensions.school + elsif User.current.logged? && User.current.user_extensions.try(:school) @school_id = User.current.user_extensions.school.try(:id) end @logoLink ||= logolink() diff --git a/db/schema.rb b/db/schema.rb index 95c52cca3..af7a7e42b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -437,9 +437,9 @@ 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 "image_width", :default => 107 t.integer "image_height", :default => 63 @@ -976,10 +976,11 @@ ActiveRecord::Schema.define(:version => 20140826072838) do t.string "url" t.string "title" t.integer "share_type" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.integer "project_id" t.integer "user_id" + t.string "description" end create_table "softapplications", :force => true do |t| @@ -1085,8 +1086,8 @@ ActiveRecord::Schema.define(:version => 20140826072838) do t.integer "zip_code" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false - t.integer "identity" t.string "technical_title" + t.integer "identity" t.string "student_id" t.string "teacher_realname" t.string "student_realname" @@ -1144,9 +1145,6 @@ ActiveRecord::Schema.define(:version => 20140826072838) do t.integer "active" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false - t.integer "level" - t.integer "file" - t.integer "issue" end create_table "user_statuses", :force => true do |t|