Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fix heroku env issue fixes #1625 #1638

Closed
wants to merge 2 commits into from

2 participants

@peterberkenbosch
Collaborator

Like discussed here : #1625.

@peterberkenbosch
Collaborator

anybody want's to pull this in? Or is there something missing.. Love to have this in master..

@radar
Collaborator

Sorry, had been obsessing over auth recently and had a flu which made me almost useless last week. Yes, we will pull this in. Right now.

@radar radar referenced this pull request from a commit
@peterberkenbosch peterberkenbosch use the Rails.configuration for fetching the available env values. Si…
…nce on Heroku the other method does not work.

also issue on payment_method and trackers.

Merges #1638

Fixes #1625
3e6aa0a
@radar
Collaborator

Merged into 1-0-stable, 1-1-stable and master.

@radar radar referenced this pull request from a commit
@peterberkenbosch peterberkenbosch use the Rails.configuration for fetching the available env values. Si…
…nce on Heroku the other method does not work.

also issue on payment_method and trackers.

Merges #1638

Fixes #1625
a08d03a
@radar radar referenced this pull request from a commit
@peterberkenbosch peterberkenbosch use the Rails.configuration for fetching the available env values. Si…
…nce on Heroku the other method does not work.

also issue on payment_method and trackers.

Merges #1638

Fixes #1625
d377a45
@radar radar closed this
@peterberkenbosch
Collaborator
@radar
Collaborator

Energy levels aren't flat any more, but still got a bit of a throat thing going on. I blame Manning ;)

@tvdeyen tvdeyen referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@tvdeyen tvdeyen referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 5, 2012
  1. @peterberkenbosch

    use the Rails.configuration for fetching the available env values. Si…

    peterberkenbosch authored
    …nce on Heroku the other method does not work.
  2. @peterberkenbosch
This page is out of date. Refresh to see the latest.
View
2  core/app/views/spree/admin/mail_methods/_form.html.erb
@@ -5,7 +5,7 @@
<p>
<%= f.label :environment, t(:environment) %><br />
<%= f.collection_select(:environment,
- Spree::Configuration.configurations.keys.sort,
+ Rails.configuration.database_configuration.keys.sort,
:to_s, :titleize,
{}, {:id => 'gtwy-env'}) %>
</p>
View
2  core/app/views/spree/admin/payment_methods/_form.html.erb
@@ -10,7 +10,7 @@
<tr data-hook="environment">
<td><%= label_tag nil, t(:environment) %></td>
<td>
- <%= collection_select(:payment_method, :environment, Spree::Configuration.configurations.keys, :to_s, :titleize, {}, {:id => 'gtwy-env'}) %>
+ <%= collection_select(:payment_method, :environment, Rails.configuration.database_configuration.keys.sort, :to_s, :titleize, {}, {:id => 'gtwy-env'}) %>
</td>
</tr>
<tr data-hook="display">
View
2  core/app/views/spree/admin/trackers/_form.html.erb
@@ -6,7 +6,7 @@
<tr data-hook="environment">
<td><%= label_tag nil, t(:environment) %></td>
<td>
- <%= collection_select(:tracker, :environment, Spree::Configuration.configurations.keys, :to_s, :titleize, {}, {:id => 'tracker-env'}) %>
+ <%= collection_select(:tracker, :environment, Rails.configuration.database_configuration.keys.sort, :to_s, :titleize, {}, {:id => 'tracker-env'}) %>
</td>
</tr>
<tr data-hook="active">
Something went wrong with that request. Please try again.