[#4420] Display per period Retainer values on the Contract details page.
This commit is contained in:
@@ -28,7 +28,7 @@ class DeliverablesController < InheritedResources::Base
|
||||
|
||||
def show
|
||||
if show_partial?
|
||||
@period = params[:period]
|
||||
@period = extract_period(params[:period])
|
||||
render :partial => 'deliverables/details_row', :locals => {:contract => @contract, :deliverable => @contract.deliverables.find(params[:id]), :period => @period}
|
||||
else
|
||||
redirect_to contract_url(@project, @contract)
|
||||
@@ -57,4 +57,13 @@ class DeliverablesController < InheritedResources::Base
|
||||
@project = @contract.project
|
||||
end
|
||||
|
||||
def extract_period(param)
|
||||
period = nil
|
||||
if param.present? && param.match(/\A\d{4}-\d{2}\z/) # "YYYY-MM"
|
||||
year, month = param.split('-')
|
||||
period = Date.new(year.to_i, month.to_i, 1)
|
||||
end
|
||||
period
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user