diff --git a/app/controllers/admins/statistics_controller.rb b/app/controllers/admins/statistics_controller.rb index a682e12fb..707f36363 100644 --- a/app/controllers/admins/statistics_controller.rb +++ b/app/controllers/admins/statistics_controller.rb @@ -4,9 +4,16 @@ class Admins::AboutsController < Admins::BaseController projects = Project.all.project_statics_select by_time = params[:time] project_type = params[:project_type] + is_private = params[:is_private] + project_category_id = params[:project_category_id] + project_language_id = params[:project_language_id] + license_id = params[:license_id] projects = projects.where(project_type: project_type) if project_type.present? - + projects = projects.where(is_private: is_private) if is_private.present? + projects = projects.where(project_category_id: project_category_id) if project_category_id.present? + projects = projects.where(project_language_id: project_language_id) if project_language_id.present? + projects = projects.where(license_id: license_id) if license_id.present? if by_time.present? case by_time.to_s @@ -22,7 +29,7 @@ class Admins::AboutsController < Admins::BaseController projects = projects.group_by_day(:created_on).count end end - + @projects = projects end end \ No newline at end of file diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 506a765bd..8d19be016 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -162,9 +162,11 @@ class IssuesController < ApplicationController issue_tags_value: params[:issue_tag_ids].present? ? params[:issue_tag_ids].join(",") : "", closed_on: (params[:status_id].to_i == 5) ? Time.now : nil, issue_classify: "issue", - branch_name: params[:branch_name].to_s + branch_name: params[:branch_name].to_s, + author_id: current_user.id, + project_id: @project.id } - @issue = Issue.new(issue_params.merge(author_id: current_user.id, project_id: @project.id)) + @issue = Issue.new(issue_params) if @issue.save! if params[:attachment_ids].present? params[:attachment_ids].each do |id| diff --git a/app/views/admins/statistics/index.html.erb b/app/views/admins/statistics/index.html.erb new file mode 100644 index 000000000..030693d17 --- /dev/null +++ b/app/views/admins/statistics/index.html.erb @@ -0,0 +1 @@ +<%= @projects %> \ No newline at end of file