diff --git a/ReadMe.txt b/ReadMe.txt index 32ac107e3..8c57f348c 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -68,5 +68,7 @@ bundle exec rake db:migrate:up VERSION=20140410021724 4 点击“查询”(就是确定的功能) =============================================================================== 0719：若遇到首页定制报错问题请尝试如下操作 +如果运行迁移文件有报错与‘sort_type’相关 先运行 bundle exec rake db:migrate:down version=20140716021202 bundle exec rake db:migrate:up version=20140716021202 +在按如下步骤执行，未报与之相关的则直接按如下步骤执行 1.运行 bundle exec rake db:migrate:down version=20140719080032 2.运行 bundle exec rake db:migrate:up version=20140719080032 \ No newline at end of file diff --git a/app/controllers/contests_controller.rb b/app/controllers/contests_controller.rb index 456aa7b4a..c3ddfafdc 100644 --- a/app/controllers/contests_controller.rb +++ b/app/controllers/contests_controller.rb @@ -1,6 +1,7 @@ # fq # class BidsController < ApplicationController class ContestsController < ApplicationController + layout "contest_base" menu_item :respond menu_item :project, :only => :show_project menu_item :application, :only => :show_softapplication diff --git a/app/controllers/softapplications_controller.rb b/app/controllers/softapplications_controller.rb index b60e9ba5c..596b60da2 100644 --- a/app/controllers/softapplications_controller.rb +++ b/app/controllers/softapplications_controller.rb @@ -1,4 +1,5 @@ class SoftapplicationsController < ApplicationController + layout "contest_base" before_filter :find_softapplication, only: [:edit, :update, :destroy] before_filter :editable, only: [:edit, :update] before_filter :destroyable, only: :destroy diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb index c9fecc6a9..4c2a63844 100644 --- a/app/views/issues/_list.html.erb +++ b/app/views/issues/_list.html.erb @@ -39,7 +39,7 @@