Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: nherzing/crowdring
base: 76772a1d02
...
head fork: nherzing/crowdring
compare: 9a0240dbb7
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
View
7 lib/crowdring/crowdring.rb
@@ -317,6 +317,13 @@ def process_request(service_name, request, response_type)
end
end
+ post '/campaign/:id/asks/:ask_id/trigger' do
+ campaign = Campaign.get(params[:id])
+ ask = campaign.asks.get(params[:ask_id])
+ ask.trigger(campaign.ringers, campaign.sms_number.raw_number)
+ end
+
+
post '/campaign/:id/destroy' do
campaign = Campaign.get(params[:id])
if campaign.destroy
View
7 lib/views/campaign.haml
@@ -15,7 +15,7 @@
%span Campaign Details
%li
%a{href: "#basic-chart"}
- %span Statistic Analysis
+ %span Analytics
%li
%a{href: "#export"}
%span Export To CSV
@@ -49,9 +49,8 @@
#asks
%h2= "ASKS"
-@campaign.asks.each do |ask|
- -if @campaign.asks.select{|n| n.triggered_ask && n.triggered_ask == ask}.empty?
- %form{action: "/campaign/#{@campaign.id}/broadcast", method: "post"}
- %input{type: 'hidden', name: 'message', value: "#{ask.message}"}
+ -if @campaign.asks.select{|n| n.triggered_ask && n.triggered_ask == ask}.empty? && ask != @campaign.asks.first
+ %form{action: "/campaign/#{@campaign.id}/asks/#{ask.id}/trigger", method: "post"}
%button{type:'submit'} Launch the Ask
=haml :ask, locals: {ask: ask, type: ask.class.typesym}
View
3  lib/views/campaign_add_new_ask.haml
@@ -20,6 +20,7 @@
%input{type: 'radio', name:'[triggered_by]', id: 'ask', value: 'previous'}
%label{for: 'ask'} The Previous Event
%button{type:'submit'} Add new ask
-
+%form{action: '/campaigns##{@campaign.id}', method: 'get'}
+ %button « Back
#original-filtered-message-template-container{style: 'display:none'}
=haml :filtered_message_template

No commit comments for this range

Something went wrong with that request. Please try again.