diff --git a/app/controllers/admins/statistics_controller.rb b/app/controllers/admins/project_statistics_controller.rb similarity index 66% rename from app/controllers/admins/statistics_controller.rb rename to app/controllers/admins/project_statistics_controller.rb index 707f36363..ce3491ec5 100644 --- a/app/controllers/admins/statistics_controller.rb +++ b/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 diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d53d4b5da..100c87407 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -328,7 +328,7 @@ class ApplicationController < ActionController::Base def current_user # User.current - User.find_by_id 50207 + User.find_by_id 36390 # nil end diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 8d19be016..f72fd4109 100644 --- a/app/controllers/issues_controller.rb +++ b/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) diff --git a/app/views/admins/statistics/index.html.erb b/app/views/admins/project_statistics/index.html.erb similarity index 100% rename from app/views/admins/statistics/index.html.erb rename to app/views/admins/project_statistics/index.html.erb diff --git a/config/routes.rb b/config/routes.rb index 38d59cb90..07f9794f2 100644 --- a/config/routes.rb +++ b/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