修复数据库为初始状态时会出现的部分bug、去除部分连接的域名

app/controllers/application_controller.rb

@@ -725,6 +725,12 @@ class ApplicationController < ActionController::Base
   #查找首页相关信息
   def find_first_page
     @first_page = FirstPage.where("page_type = 'project'").first
+    if @first_page.nil?
+      @first_page = FirstPage.new
+      @first_page.page_type = 'project'
+      @first_page.description = ""
+      @first_page.save()
+    end
     @show_course = @first_page.show_course
     @show_contest = @first_page.show_contest
   end

app/controllers/welcome_controller.rb

@@ -20,11 +20,12 @@ class WelcomeController < ApplicationController
   include WelcomeHelper
   helper :project_score
   caches_action :robots
+  before_filter :find_first_page, :only => [:index]
   # before_filter :fake, :only => [:index, :course]
   before_filter :entry_select, :only => [:index]
  
   def index
-    @first_page = FirstPage.where("page_type = 'project'").first
+    #@first_page = FirstPage.where("page_type = 'project'").first
     #@show_course = @first_page.show_course
     if @first_page.nil? ||  @first_page.sort_type.nil?
       @projects = find_miracle_project(10, 3,"score desc")
@@ -76,7 +77,7 @@ class WelcomeController < ApplicationController
    logo = get_avatar?(@course_page)
     id = params[:school_id]
     logo_link = ""
-    if id.nil? && User.current.user_extensions.school.nil?
+    if id.nil? && (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?)
       if logo
         logo_link = url_to_avatar(@course_page)
       else
@@ -148,8 +149,8 @@ class WelcomeController < ApplicationController
   private
   # 判断网站的入口，是课程 course 则跳过index去渲染 course 方法
   def entry_select
-    @first_page = FirstPage.where("page_type = 'project'").first
+    #@first_page = FirstPage.where("page_type = 'project'").first
-    url = request.original_url
+    url = request.original_url.gsub('/','')
     if url.include?(Setting.host_course)
       if @first_page.show_course == 1
         course

app/views/layouts/_base_header.html.erb

@@ -44,11 +44,11 @@
 				<% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%>
                  <% hasCourse=true%>
 
-				<li  id="course_loggedas_li" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id, host: Setting.course_domain} %>
+				<li  id="course_loggedas_li" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id} %>
                     <ul class="course_sub_menu">
                     <% User.current.courses.each do |course| %>
                         <% if !course_endTime_timeout?(course) %>
-                            <li><%= link_to course.name.truncate(10, omission: '...'), {:controller => 'courses',:action => 'show',id:course.id, host: Setting.course_domain} %></li>
+                            <li><%= link_to course.name.truncate(10, omission: '...'), {:controller => 'courses',:action => 'show',id:course.id} %></li>
                         <% end %>
                     <% end %>
                   </ul>

app/views/welcome/contest.html.erb

@@ -153,7 +153,7 @@
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject" >
 <h3 style="margin-left: 5px; color: #e8770d;"><strong><%=l(:label_current_hot_contest)%></strong></h3>
-	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), {:controller => 'contests', :action => 'index', :host => Setting.contest_domain}, :target => "_blank" %></span>
+	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), {:controller => 'contests', :action => 'index'}, :target => "_blank" %></span>
 	<div class="d-p-projectlist-box">
 		<div class="d-p-projectlist">
 			<% find_all_hot_contest.map do |contest| break if(contest == find_all_hot_contest[5]) %>
@@ -294,7 +294,7 @@
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: left;">
 <h3 style="margin-left: 5px; color: #e8770d;"><strong><%=l(:label_current_attendingcontest_work)%></strong></h3>
-	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), {:controller => 'softapplications', :action => 'index', :host => Setting.contest_domain}, :target => "_blank" %></span>
+	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), {:controller => 'softapplications', :action => 'index'}, :target => "_blank" %></span>
 	<div class="d-p-projectlist-box">
 		<% if Softapplication.count > 0%>
 			<div class="d-p-projectlist">

app/views/welcome/course.html.erb

@@ -42,7 +42,7 @@
 
     </div>
     <div class="course welcome_left" id="welcome_left">
-			<span class="font_welcome_school"> <% if @school_id.nil? and User.current.user_extensions.school.nil? %>
+			<span class="font_welcome_school"> <% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %>
               <% else %>
 					<% if @school_id == "0" %>
                   <% else %>
@@ -58,7 +58,7 @@
       <% unless @course_page.nil? %>
         <span class="font_welcome_trustie"><%= @course_page.title %> </span>
 
-      <% if @school_id.nil? and User.current.user_extensions.school.nil? %>
+      <% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %>
           <span class="font_welcome_tdescription">, <%= @course_page.description %></span>
       <% else %>
           <% if @school_id == "0" %>

db/schema.rb

@@ -177,58 +177,6 @@ ActiveRecord::Schema.define(:version => 20140814062455) do
 
   add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
 
-  create_table "code_review_assignments", :force => true do |t|
-    t.integer "issue_id"
-    t.integer "change_id"
-    t.integer "attachment_id"
-    t.string  "file_path"
-    t.string  "rev"
-    t.string  "rev_to"
-    t.string  "action_type"
-    t.integer "changeset_id"
-  end
-
-  create_table "code_review_project_settings", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "tracker_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "updated_by"
-    t.boolean  "hide_code_review_tab",     :default => false
-    t.integer  "auto_relation",            :default => 1
-    t.integer  "assignment_tracker_id"
-    t.text     "auto_assign"
-    t.integer  "lock_version",             :default => 0,     :null => false
-    t.boolean  "tracker_in_review_dialog", :default => false
-  end
-
-  create_table "code_review_user_settings", :force => true do |t|
-    t.integer  "user_id",           :default => 0, :null => false
-    t.integer  "mail_notification", :default => 0, :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "code_reviews", :force => true do |t|
-    t.integer  "project_id"
-    t.integer  "change_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "line"
-    t.integer  "updated_by_id"
-    t.integer  "lock_version",        :default => 0, :null => false
-    t.integer  "status_changed_from"
-    t.integer  "status_changed_to"
-    t.integer  "issue_id"
-    t.string   "action_type"
-    t.string   "file_path"
-    t.string   "rev"
-    t.string   "rev_to"
-    t.integer  "attachment_id"
-    t.integer  "file_count",          :default => 0, :null => false
-    t.boolean  "diff_all"
-  end
-
   create_table "comments", :force => true do |t|
     t.string   "commented_type", :limit => 30, :default => "", :null => false
     t.integer  "commented_id",                 :default => 0,  :null => false
@@ -873,7 +821,7 @@ ActiveRecord::Schema.define(:version => 20140814062455) do
     t.integer  "osp_id"
     t.integer  "parent_id"
     t.string   "subject",                               :null => false
-    t.text     "content",            :limit => 16777215,                    :null => false
+    t.text     "content",                               :null => false
     t.integer  "author_id"
     t.integer  "replies_count",      :default => 0
     t.integer  "last_reply_id"
@@ -961,7 +909,6 @@ ActiveRecord::Schema.define(:version => 20140814062455) do
     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|
@@ -1067,8 +1014,8 @@ ActiveRecord::Schema.define(:version => 20140814062455) do
     t.integer  "zip_code"
     t.datetime "created_at",         :null => false
     t.datetime "updated_at",         :null => false
-    t.string   "technical_title"
     t.integer  "identity"
+    t.string   "technical_title"
     t.string   "student_id"
     t.string   "teacher_realname"
     t.string   "student_realname"
@@ -1126,6 +1073,9 @@ ActiveRecord::Schema.define(:version => 20140814062455) 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|

lib/redmine.rb

@@ -408,7 +408,7 @@ Redmine::MenuManager.map :course_menu do |menu|
 end
 Redmine::MenuManager.map :user_menu do |menu|
   menu.push :activity, {:controller => 'users', :action => 'show', :host => Setting.user_domain }
-  menu.push :user_course, {:controller => 'users', :action => 'user_courses', :host => Setting.course_domain}
+  menu.push :user_course, {:controller => 'users', :action => 'user_courses'}
   #menu.push :user_homework, {:controller => 'users', :action => 'user_homeworks'} by huang
   menu.push :user_project, {:controller => 'users', :action => 'user_projects', :host => Setting.project_domain}  
   # menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids'} by huang