diff options
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/main/api_keys.css.scss | 3 | ||||
| -rw-r--r-- | app/views/api_keys/_form.html.erb | 2 | ||||
| -rw-r--r-- | app/views/api_keys/show.html.erb | 24 | ||||
| -rw-r--r-- | app/views/help/introduction.textile | 2 | ||||
| -rw-r--r-- | config/environment.rb | 2 | ||||
| -rw-r--r-- | config/locales/api_keys.yml | 4 |
7 files changed, 39 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f6dfd2fd4..6608ab53c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ -# Version 3.0.0 (en cours) +# Version 3.0.1 (en cours) +* Corrections + * mise en place d'un formulaire de consultation des clés de l'API V1 + +# Version 3.0.0 (20/08/15) * Nouvelles fonctionnalités * Mise à jour des briques logicielles utilisées ( Rails 4 et plugins associées ) et version du langage Ruby ( 1.9.3 -> 2.1.6 en restant compatible 1.9.3 ) * Prise en compte d'une barre de progression lorsqu'un import, un export ou une validation est lancé diff --git a/app/assets/stylesheets/main/api_keys.css.scss b/app/assets/stylesheets/main/api_keys.css.scss index 5ac873da7..61dff90b8 100644 --- a/app/assets/stylesheets/main/api_keys.css.scss +++ b/app/assets/stylesheets/main/api_keys.css.scss @@ -4,5 +4,8 @@ #workspace.api_keys.show { + .summary p label { + font-weight: bold; + } } diff --git a/app/views/api_keys/_form.html.erb b/app/views/api_keys/_form.html.erb index de3f9ad7e..0adff4155 100644 --- a/app/views/api_keys/_form.html.erb +++ b/app/views/api_keys/_form.html.erb @@ -2,7 +2,7 @@ <%= form.inputs do %> <%= form.input :name %> <% unless @api_key.new_record? %> - <%= form.input :token, :input_html => { :disabled => true } %> + <%= form.input :token, :input_html => { :readonly => true } %> <% end %> <% end %> diff --git a/app/views/api_keys/show.html.erb b/app/views/api_keys/show.html.erb new file mode 100644 index 000000000..1fb5236b3 --- /dev/null +++ b/app/views/api_keys/show.html.erb @@ -0,0 +1,24 @@ +<%= title_tag t('api_keys.show.title') %> + +<div class="api_keys_show"> + + <div class="summary"> + <p> + <label><%= @api_key.class.human_attribute_name("name") %>: </label> + <%= @api_key.name %> + </p> + <p> + <label><%= @api_key.class.human_attribute_name("token") %>: </label> + <%= @api_key.token %> + </p> + </div> +</div> + +<% content_for :sidebar do %> +<ul class="actions"> + <li><%= link_to t('api_keys.actions.new'), new_referential_api_key_path(@referential), :class => "add" %></li> + <li><%= link_to t('api_keys.actions.edit'), edit_referential_api_key_path(@referential, @api_key), :class => "edit" %></li> + <li><%= link_to t('api_keys.actions.destroy'), referential_api_key_path(@referential, @api_key), :method => :delete, :data => {:confirm => t('api_keys.actions.destroy_confirm')}, :class => "remove" %></li> + <br> +</ul> +<% end %> diff --git a/app/views/help/introduction.textile b/app/views/help/introduction.textile index f2e8df735..8a30e7e0e 100644 --- a/app/views/help/introduction.textile +++ b/app/views/help/introduction.textile @@ -16,7 +16,7 @@ D'autres utilisateurs potentiels sont également identifiés : services de l'ét h3. Ce que vous trouverez dans ce manuel Vous trouverez dans ce document, toutes les informations nécessaires à la prise en main de l’application. -Le manuel couvre la version 3.0.0. +Le manuel couvre la version 3.0.1. diff --git a/config/environment.rb b/config/environment.rb index ebc5d5098..dd88c63b5 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -5,4 +5,4 @@ require File.expand_path('../application', __FILE__) Rails.application.initialize! # Fix version -APP_VERSION = '3.0.0' +APP_VERSION = '3.0.1' diff --git a/config/locales/api_keys.yml b/config/locales/api_keys.yml index e64bbb5b5..4db6d7e81 100644 --- a/config/locales/api_keys.yml +++ b/config/locales/api_keys.yml @@ -5,6 +5,8 @@ en: edit: "Edit this api key" destroy: "Remove this api key" destroy_confirm: "Are you sure you want destroy this api key?" + show: + title: "Api key" new: title: "Add a new api key" edit: @@ -23,6 +25,8 @@ fr: edit: "Modifier la clé d'accès API" destroy: "Supprimer la clé d'accès API" destroy_confirm: "Etes vous sûr de vouloir détruire la clé d'accès API ?" + show: + title: "Clé d'accès API" new: title: "Ajouter une clé d'accès API" edit: |