修改issue

forge
sylor_huang@126.com 5 years ago
parent fee43f52a7
commit e248eb1108

@ -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

@ -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|

Loading…
Cancel
Save