Created
October 23, 2014 16:35
-
-
Save DanBradbury/68cd77ff52ee4c169c68 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[1mdiff --git a/app/controllers/networks_controller.rb b/app/controllers/networks_controller.rb[m | |
[1mindex 47582da..2f37495 100644[m | |
[1m--- a/app/controllers/networks_controller.rb[m | |
[1m+++ b/app/controllers/networks_controller.rb[m | |
[36m@@ -588,7 +588,7 @@[m [mdef advertiser_campaigns_columns tab[m | |
r.column :stats_call_count_yesterday, :friendly_name => "<div class='align_center'>Calls<br />Yesterday</div>"[m | |
end[m | |
[m | |
[31m- if tab.in?( [:AllButArchived, :Suspended] )[m | |
[32m+[m[32m if tab.in?( [:AllButArchived, :Suspended, :Paused] )[m | |
r.column :stats_call_count, :friendly_name => "<div class='align_center'>Calls<br />MTD</div>"[m | |
r.column :stats_sum_advertiser_payin, :friendly_name => "<div class='align_center'><br />#{current_network.currency_symbol} MTD</div>", :sortDir => "DESC"[m | |
r.column :stats_conversion_rate, :friendly_name => "<div class='align_center'>Conv. Rate<br />MTD</div>", :renderer => 'conversion_rate_renderer'[m | |
[36m@@ -640,7 +640,7 @@[m [mdef advertiser_campaigns_columns tab[m | |
r.column :budget, :friendly_name => "<br />Budget", :sortable => false, :record_expression => lambda { |ac| b = ac.budget_activities.find_by_alert_name( "commission_budget_terms" ); ( b._?.as_json_for_graphing || {} ).merge( :edit_link => url_for(:controller => :advertiser_campaigns, :action => ac.pricing_step, :id => ac.id, :only_path => true, :show_alerts => 1) ) }, :renderer => "budget_alert_renderer"[m | |
r.column :call_cap, :friendly_name => "<br />Call Cap", :sortable => false, :record_expression => lambda { |ac| b = ac.budget_activities.find_by_alert_name( "call_count_budget_terms" ); ( b._?.as_json_for_graphing || {} ).merge( :edit_link => url_for(:controller => :advertiser_campaigns, :action => ac.pricing_step, :id => ac.id, :only_path => true, :show_alerts => 1) ) }, :renderer => "budget_alert_renderer"[m | |
end[m | |
[31m- if tab.in?( [:Live,:Suspended] )[m | |
[32m+[m[32m if tab.in?( [:Live,:Suspended, :Paused] )[m | |
r.column :actions, :friendly_name => "Additional<br/>Actions", :record_expression => lambda { |ac|[m | |
actions = [][m | |
actions << { :text => "forwarding", :link => url_for( :controller => 'advertiser_campaigns', :action => 'transfer_settings', :id => ac.id ) }[m | |
[1mdiff --git a/app/views/networks/advertiser_campaigns.html.erb b/app/views/networks/advertiser_campaigns.html.erb[m | |
[1mindex a88303c..519ae6d 100644[m | |
[1m--- a/app/views/networks/advertiser_campaigns.html.erb[m | |
[1m+++ b/app/views/networks/advertiser_campaigns.html.erb[m | |
[36m@@ -65,7 +65,8 @@[m [mfunction on_store_load( store_name )[m | |
grids = [ [:Pending, { :title => "Pending" }],[m | |
[:Live, { :title => "Live" }],[m | |
[:Suspended, { :title => "Suspended" }],[m | |
[31m- [:Archived, { :title => "Archived / Expired" } ] ][m | |
[32m+[m[32m [:Expired, { :title => "Archived" } ],[m | |
[32m+[m[32m [:Paused, { :title => "Paused" } ] ][m | |
%>[m | |
[m | |
<% render_bread_crumbs( [ ["Network Home", { :controller => :networks, :action => :show, :id => current_network.id } ],[m | |
[36m@@ -92,4 +93,4 @@[m [mgrids = [ [:Pending, { :title => "Pending" }],[m | |
:defer_render => true,[m | |
:enable_tooltips => true[m | |
%>[m | |
[31m-<% end %>[m | |
\ No newline at end of file[m | |
[32m+[m[32m<% end %>[m |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment