[#6636] Prototype frontend period switcher
This commit is contained in:
1 parent
257afa249f
commit
89cefddc2f
3 files changed
+21
-2
No files matched your search
@@ -8,6 +8,7 @@ class DeliverablesController < InheritedResources::Base
|
|||||||
|
|
||||||
helper :contracts
|
helper :contracts
|
||||||
helper :contract_formatter
|
helper :contract_formatter
|
||||||
|
include ContractsHelper
|
||||||
|
|
||||||
def index
|
def index
|
||||||
redirect_to contract_url(@project, @contract)
|
redirect_to contract_url(@project, @contract)
|
||||||
@@ -37,8 +38,16 @@ class DeliverablesController < InheritedResources::Base
|
|||||||
end
|
end
|
||||||
|
|
||||||
def finances
|
def finances
|
||||||
|
@deliverable = @contract.deliverables.find(params[:id])
|
||||||
|
period = extract_period(params[:period])
|
||||||
|
if period
|
||||||
|
@period = validate_period(@deliverable, period)
|
||||||
|
else
|
||||||
|
@period = nil
|
||||||
|
end
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.js { render :partial => 'deliverables/finances', :locals => {:contract => @contract, :deliverable => @contract.deliverables.find(params[:id])} }
|
format.js { render :partial => 'deliverables/finances', :locals => {:contract => @contract, :deliverable => @deliverable, :period => @period } }
|
||||||
format.html { }
|
format.html { }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,16 @@
|
|||||||
|
|
||||||
<h2><%= h(deliverable.title) %></h2>
|
<h2><%= h(deliverable.title) %></h2>
|
||||||
|
|
||||||
|
<% if deliverable.retainer? %>
|
||||||
|
<div class="deliverable-period">
|
||||||
|
<form method="get" action="<%= finances_contract_deliverable_path(deliverable.project, contract, deliverable, :format => 'js') %>">
|
||||||
|
<select name="period" id="retainer_period_change_<%= h(deliverable.id) %>" class="retainer_period_change">
|
||||||
|
<%= retainer_period_options(deliverable, :selected => period) %>
|
||||||
|
</select>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
<% has_categories = deliverable.project.issue_categories.count > 0 %>
|
<% has_categories = deliverable.project.issue_categories.count > 0 %>
|
||||||
|
|
||||||
<div id="deliverable-activities" class="deliverable-finance-report" style=" width: 48%">
|
<div id="deliverable-activities" class="deliverable-finance-report" style=" width: 48%">
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
<%= render :partial => 'finances', :locals => {:contract => @contract, :deliverable => @contract.deliverables.find(params[:id])} %>
|
<%= render :partial => 'finances', :locals => {:contract => @contract, :deliverable => @deliverable, :period => @period } %>
|
||||||
Reference in new issue
Block a user