Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge

app/controllers/admins/project_statistics_controller.rb

@@ -1,4 +1,4 @@
-class Admins::AboutsController < Admins::BaseController
+class Admins::ProjectStatisticsController < Admins::BaseController
 
   def index
     projects = Project.all.project_statics_select
@@ -18,15 +18,15 @@ class Admins::AboutsController < Admins::BaseController
     if by_time.present?
       case by_time.to_s
       when "week"
-        projects = projects.group_by_week(:created_on).count
+        projects = projects.group_by_week(:created_on, time_zone: "Beijing").count
       when "month"
-        projects = projects.group_by_month(:created_on).count
+        projects = projects.group_by_month(:created_on, time_zone: "Beijing").count
       when "quarter"
-        projects = projects.group_by_month(:created_on).count
+        projects = projects.group_by_month(:created_on, time_zone: "Beijing").count
       when "year"
-        projects = projects.group_by_year(:created_on).count
+        projects = projects.group_by_year(:created_on, time_zone: "Beijing").count
       else
-        projects = projects.group_by_day(:created_on).count
+        projects = projects.group_by_day(:created_on, time_zone: "Beijing").count
       end
     end
     @projects = projects

app/controllers/issues_controller.rb

@@ -163,7 +163,7 @@ class IssuesController < ApplicationController
         closed_on: (params[:status_id].to_i == 5) ? Time.now : nil,
         issue_classify: "issue",
         branch_name: params[:branch_name].to_s,
-        author_id: current_user.id,
+        author_id: params[:author_id] || current_user.id,
         project_id: @project.id
       }
       @issue = Issue.new(issue_params)

config/routes.rb

@@ -743,6 +743,7 @@ Rails.application.routes.draw do
 
   namespace :admins do
     get '/', to: 'dashboards#index'
+    resources :project_statistics
     resources :major_informations, only: [:index]
     resources :ec_templates, only: [:index, :destroy] do
       collection do