touchstone 0.5.3 → 0.5.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/app/controllers/touchstone/campaigns_controller.rb +1 -1
  2. data/app/views/touchstone/campaigns/index.html.erb +3 -1
  3. data/lib/touchstone/version.rb +1 -1
  4. metadata +4 -4
data/app/controllers/touchstone/campaigns_controller.rb CHANGED
@@ -4,7 +4,7 @@ module Touchstone
4
4
  layout 'touchstone/touchstone'
5
5
 
6
6
  def index
7
- @campaigns = Campaign.all
7
+ @campaigns = Campaign.includes(:campaign_signups).all
8
8
  end
9
9
 
10
10
  def new
data/app/views/touchstone/campaigns/index.html.erb CHANGED
@@ -7,10 +7,11 @@
7
7
  <thead>
8
8
  <tr>
9
9
  <th scope="col" width="15%">Campaign ID</th>
10
- <th scope="col" width="36%">Name</th>
10
+ <th scope="col" width="30%">Name</th>
11
11
  <th scope="col" width="17%">Start date</th>
12
12
  <th scope="col" width="17%">End date</th>
13
13
  <th scope="col" width="15%">Spend amount</th>
14
+ <th scope="col" width="6%">Visits</th>
14
15
  </tr>
15
16
  </thead>
16
17
  <tbody>
@@ -21,6 +22,7 @@
21
22
  <td><%= campaign.start_date.strftime("%d %B %Y") %></td>
22
23
  <td><%= campaign.end_date.strftime("%d %B %Y") %></td>
23
24
  <td><%= Touchstone.currency %><%= sprintf("%.2f", campaign.spend_amount) %></td>
25
+ <td><%= campaign.campaign_signups.count %></td>
24
26
  </tr>
25
27
  <% end %>
26
28
  </tbody>
data/lib/touchstone/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Touchstone
2
- VERSION = "0.5.3"
2
+ VERSION = "0.5.4"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: touchstone
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.3
4
+ version: 0.5.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-05-15 00:00:00.000000000 Z
12
+ date: 2012-05-19 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -159,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
159
159
  version: '0'
160
160
  segments:
161
161
  - 0
162
- hash: 2060953684547118764
162
+ hash: -2829620605377975316
163
163
  required_rubygems_version: !ruby/object:Gem::Requirement
164
164
  none: false
165
165
  requirements:
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
168
168
  version: '0'
169
169
  segments:
170
170
  - 0
171
- hash: 2060953684547118764
171
+ hash: -2829620605377975316
172
172
  requirements: []
173
173
  rubyforge_project:
174
174
  rubygems_version: 1.8.20