floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-17 02:05:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

添加children_journals

Browse Source
This commit is contained in:
sylor_huang@126.com
2020-05-28 18:11:38 +08:00
parent dd871ba481
commit c141e510b8
4 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/issues_controller.rb
View File

@@ -447,7 +447,7 @@ class IssuesController < ApplicationController
status_id: params[:status_id],
priority_id: params[:priority_id],
fixed_version_id: params[:fixed_version_id],
start_date: params[:start_date].to_s.to_date,
start_date: params[:start_date].to_s.to_date || Time.current.to_date,
due_date: params[:due_date].to_s.to_date,
estimated_hours: params[:estimated_hours],
done_ratio: params[:done_ratio],

10
app/controllers/journals_controller.rb
View File

@@ -1,6 +1,6 @@
class JournalsController < ApplicationController
before_action :require_login, except: :index
before_action :set_issue
before_action :set_issue, except: :get_children_journals
before_action :check_issue_permission
before_action :set_journal, only: [:destroy, :edit, :update]
@@ -73,6 +73,14 @@ class JournalsController < ApplicationController
end
def get_children_journals
@page = params[:page] || 1
@limit = params[:limit] || 10
journals = Journal.children_journals(params[:parent_id]).journal_includes.order("created_on desc")
@journals_size = journals.size
@children_journals = journals.page(@page).per(@limit)
end
private