From 494d3af9a4acc7f817560e603fa1760ba46ee351 Mon Sep 17 00:00:00 2001 From: z9hang Date: Wed, 16 Jul 2014 15:16:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=B4=E5=90=A7?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/forums_controller.rb | 6 +++--- db/schema.rb | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb index 3b8b4b928..9c41f91d6 100644 --- a/app/controllers/forums_controller.rb +++ b/app/controllers/forums_controller.rb @@ -50,14 +50,14 @@ class ForumsController < ApplicationController def index @offset, @limit = api_offset_and_limit({:limit => 10}) - @forums_all = Forum.all + @forums_all = Forum.where('1=1') @forums_count = @forums_all.count @forums_pages = Paginator.new @forums_count, @limit, params['page'] @offset ||= @forums_pages.offset - # @forums = @forums_all.offset(@offset).limit(@limit).all - @forums = Forum.all + @forums = @forums_all.offset(@offset).limit(@limit).all + #@forums = Forum.all respond_to do |format| format.html # index.html.erb format.json { render json: @forums } diff --git a/db/schema.rb b/db/schema.rb index 6134f1601..ac5ca0644 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -770,6 +770,7 @@ ActiveRecord::Schema.define(:version => 20140716021558) do t.boolean "hidden_repo", :default => false, :null => false t.integer "attachmenttype", :default => 1 t.integer "user_id" + t.integer "dts_test", :default => 0 end add_index "projects", ["lft"], :name => "index_projects_on_lft" From 2cab9f78952212202c1a1766c0138b4ded414356 Mon Sep 17 00:00:00 2001 From: z9hang Date: Wed, 16 Jul 2014 15:24:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=83=AD=E9=97=A8=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=B7=BB=E5=8A=A0=E7=A9=BA=E5=80=BC=E5=88=A4?= =?UTF-8?q?=E6=96=AD=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=8C=89=E6=B4=BB=E8=B7=83?= =?UTF-8?q?=E5=BA=A6=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/welcome_controller.rb | 36 +++++++++++++++------------ 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 48c0cf1fb..6a1772c8b 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -32,25 +32,29 @@ class WelcomeController < ApplicationController @projects_all = Project.active.visible. joins("LEFT JOIN #{ProjectStatus.table_name} ON #{Project.table_name}.id = #{ProjectStatus.table_name}.project_id"). where("#{Project.table_name}.project_type = ? and #{Project.table_name}.id in (?)", Project::ProjectType_project,@hot_projects_ids) - - case @first_page.sort_type - when 0 - @projects = @projects_all.order("created_on desc") - when 1 - @projects = @projects_all.order("grade desc") - when 2 - @projects = @projects_all.order("watchers_count desc") - - #gcm - #when '3' + if @first_page.nil? || @first_page.sort_type.nil? + @projects = @projects_all.order("grade desc") + else + case @first_page.sort_type + when 0 + @projects = @projects_all.order("created_on desc") + when 1 + @projects = @projects_all.order("grade desc") + when 2 + @projects = @projects_all.order("watchers_count desc") + + #gcm + #when '3' #@projects=desc_sort_course_by_avtivity(@project_activity_count_array,@project_all_array) - # @projects=handle_project @projects_all,@project_activity_count - # @s_type = 3 - # @projects = @projects[@project_pages.offset, @project_pages.per_page] + # @projects=handle_project @projects_all,@project_activity_count + # @s_type = 3 + # @projects = @projects[@project_pages.offset, @project_pages.per_page] - else - @projects = @projects_all.order("grade desc") + else + @projects = @projects_all.order("grade desc") + end end + end def robots From 8d181c4e934271c557470462175e58644b1bc81d Mon Sep 17 00:00:00 2001 From: z9hang Date: Wed, 16 Jul 2014 15:32:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=87=BA=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/first_page.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/first_page.rb b/app/models/first_page.rb index d1fca531e..52c6e204d 100644 --- a/app/models/first_page.rb +++ b/app/models/first_page.rb @@ -1,6 +1,6 @@ class FirstPage < ActiveRecord::Base - attr_accessible :description, :title, :web_title,:page_type - validates_presence_of :web_title, :title, :description,:page_type,:sort_type + attr_accessible :description, :title, :web_title,:page_type,:sort_type + validates_presence_of :web_title, :title, :description,:page_type validates_length_of :web_title,:title, maximum: 30 validates_length_of :description, maximum: 100 end