diff options
| author | Marc Florisson | 2013-05-27 11:48:18 +0200 |
|---|---|---|
| committer | Marc Florisson | 2013-05-27 11:48:18 +0200 |
| commit | 01b38ce952cb2e657ab387295673fc892be3539a (patch) | |
| tree | 45595bc8188816dcfb7ee6285fe99137f38412f1 /app | |
| parent | baf4983fce9de9f1d4b8b288f23c39ef86f51e69 (diff) | |
| download | chouette-core-01b38ce952cb2e657ab387295673fc892be3539a.tar.bz2 | |
put geoportail api key in config
Diffstat (limited to 'app')
| -rw-r--r-- | app/maps/application_map.rb | 6 | ||||
| -rw-r--r-- | app/views/organisations/edit.html.erb | 1 | ||||
| -rw-r--r-- | app/views/organisations/show.html.erb | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/app/maps/application_map.rb b/app/maps/application_map.rb index e068a8950..d06a7e640 100644 --- a/app/maps/application_map.rb +++ b/app/maps/application_map.rb @@ -20,10 +20,8 @@ class ApplicationMap end def geoportail_key - if ( self.helpers && self.helpers.current_user && - self.helpers.current_user.organisation && - self.helpers.current_user.organisation.geoportail_key) - return self.helpers.current_user.organisation.geoportail_key + if ( ChouetteIhm::Application.config.respond_to? :geoportail_api_key) + return ChouetteIhm::Application.config.geoportail_api_key end return nil end diff --git a/app/views/organisations/edit.html.erb b/app/views/organisations/edit.html.erb index 0e55a1562..ef3cc1530 100644 --- a/app/views/organisations/edit.html.erb +++ b/app/views/organisations/edit.html.erb @@ -3,7 +3,6 @@ <%= semantic_form_for @organisation, :url => organisation_path do |form| %> <%= form.inputs do %> <%= form.input :name %> - <%= form.input :geoportail_key %> <% end %> <%= form.actions do %> diff --git a/app/views/organisations/show.html.erb b/app/views/organisations/show.html.erb index 753efc2c3..263933bc1 100644 --- a/app/views/organisations/show.html.erb +++ b/app/views/organisations/show.html.erb @@ -2,8 +2,6 @@ <div class="summary"> <p> - <label><%= Organisation.human_attribute_name(:geoportail_key) %>: </label> - <%= @organisation.geoportail_key ? t('.key_registered') : t('.key_not_registered') %> </p> </div> |