change author_id

dev_forge
sylor_huang@126.com 5 years ago
parent e248eb1108
commit 22f5938e8a

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

@ -328,7 +328,7 @@ class ApplicationController < ActionController::Base
def current_user def current_user
# User.current # User.current
User.find_by_id 50207 User.find_by_id 36390
# nil # nil
end end

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

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

Loading…
Cancel
Save