diff options
| author | Xinhui | 2016-05-10 14:56:23 +0200 | 
|---|---|---|
| committer | Xinhui | 2016-05-10 14:56:23 +0200 | 
| commit | 9c052ed7bc763ace5ef5a61d4408bfc5468f8d5a (patch) | |
| tree | 331dd5d3be8a18183bee6deff30452c18a28faa7 | |
| parent | 3adb65c09321d6edcec4045be6abeb34fe3bc672 (diff) | |
| download | chouette-core-9c052ed7bc763ace5ef5a61d4408bfc5468f8d5a.tar.bz2 | |
Remove user/organization edit, create, destroy link
Refs #819
| -rw-r--r-- | app/views/devise/sessions/new.html.erb | 16 | ||||
| -rw-r--r-- | app/views/organisations/show.html.erb | 3 | ||||
| -rw-r--r-- | app/views/shared/_header.erb | 9 | ||||
| -rw-r--r-- | app/views/users/_user.html.erb | 3 | ||||
| -rw-r--r-- | app/views/users/show.html.erb | 13 | ||||
| -rw-r--r-- | spec/features/users/user_show_spec.rb | 3 | 
6 files changed, 34 insertions, 13 deletions
| diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 2df4f3d97..4df538161 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -21,17 +21,23 @@              </div>              <div class="col-md-6 new_password">                <%= link_to t("devise.links.new_password"), new_password_path(resource_name) %> -              <% if devise_mapping.confirmable? && controller_name != 'confirmations' %> -                <br> -                <%= link_to t("devise.links.new_confirmation"), new_confirmation_path(resource_name) %> -              <% end %> +                <!-- FIXME ref #819 --> +                <%- if false %> +                  <% if devise_mapping.confirmable? && controller_name != 'confirmations' %> +                    <br> +                    <%= link_to t("devise.links.new_confirmation"), new_confirmation_path(resource_name) %> +                  <% end %> +                <% end %>              </div>            </div>          <% end %>        </div>      </div> -    <%= render partial: 'devise/shared/form_registration', locals: { +    <!-- FIXME ref #819 --> +    <%- if false %> +      <%= render partial: 'devise/shared/form_registration', locals: {        organisation: (resource.organisation || Organisation.new) } %> +    <% end %>    </div>  </div> diff --git a/app/views/organisations/show.html.erb b/app/views/organisations/show.html.erb index f6c497173..3994228fd 100644 --- a/app/views/organisations/show.html.erb +++ b/app/views/organisations/show.html.erb @@ -48,8 +48,11 @@  <% content_for :sidebar do %>  <ul class="actions"> +<!-- FIXME ref #819 --> +<% if false %>    <li><%= link_to t('organisations.actions.edit'), edit_organisation_path, :class => "edit" %></li>    <li><%= link_to t('users.actions.new'), new_organisation_user_path, :class => "add" %></li> +<% end %>    <li><%= link_to t('rule_parameter_sets.actions.new'), new_organisation_rule_parameter_set_path, :class => "add" %></li>  </ul>  <% end %> diff --git a/app/views/shared/_header.erb b/app/views/shared/_header.erb index 9d53d807f..ae712e48d 100644 --- a/app/views/shared/_header.erb +++ b/app/views/shared/_header.erb @@ -95,8 +95,13 @@          <li class="dropdown">            <a href="#" class="dropdown-toggle user_admin" data-toggle="dropdown"><span class="gravatar"><%= user_gravatar_image_tag(current_user, 16) %></span><%= truncate(current_user.name, :length => 20) %> <b class="caret"></b></a>            <ul class="dropdown-menu"> -            <li><%= link_to t('layouts.user.profile'), edit_user_registration_path %></li> -            <li><%= link_to t('layouts.user.sign_out'), destroy_user_session_path, :method => :delete %></li> + +              <!-- FIXME ref #819 --> +              <%- if false %> +                <li><%= link_to t('layouts.user.profile'), edit_user_registration_path %></li> +              <% end %> + +              <li><%= link_to t('layouts.user.sign_out'), destroy_user_session_path, :method => :delete %></li>              <li class="divider"></li>              <li><%= tab_link_to Organisation.model_name.human, organisation_path %></li>            </ul> diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb index c4b396650..7cd0cc17c 100644 --- a/app/views/users/_user.html.erb +++ b/app/views/users/_user.html.erb @@ -2,6 +2,8 @@    <div class="panel-heading">      <div class="panel-title clearfix">        <span class="pull-right"> +      <!-- FIXME ref #819 --> +      <% if false %>          <% if user == current_user %>            <%= link_to( edit_user_registration_path(user), :class => "btn btn-default btn-sm" ) do %>              <span class="fa fa-pencil"></span> @@ -10,6 +12,7 @@          <%= link_to organisation_user_path(user), :method => :delete, :data => {:confirm =>  t('users.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %>            <span class="fa fa-trash-o"></span>          <% end %> +      <% end %>        </span>        <h5>          <%= link_to( organisation_user_path(user), :class => "preview", :title => "#{User.model_name.human.capitalize} #{user.email}") do %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 94e968ca5..6e1c3d089 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -11,9 +11,12 @@  </p>  </div> -<% content_for(:sidebar) do %> -  <ul class="actions"> -    <li><%= link_to( t('users.actions.edit'), edit_user_registration_path, :class => "edit") if @user == current_user %></li> -    <li><%= link_to t('users.actions.destroy'), organisation_user_path(@user),:method => :delete, :data => {:confirm => t('users.actions.destroy_confirm')}, :class => "remove" %></li> -  </ul> +<!-- FIXME ref #819 --> +<% if false %> +  <% content_for(:sidebar) do %> +    <ul class="actions"> +      <li><%= link_to( t('users.actions.edit'), edit_user_registration_path, :class => "edit") if @user == current_user %></li> +      <li><%= link_to t('users.actions.destroy'), organisation_user_path(@user),:method => :delete, :data => {:confirm => t('users.actions.destroy_confirm')}, :class => "remove" %></li> +    </ul> +  <% end %>  <% end %> diff --git a/spec/features/users/user_show_spec.rb b/spec/features/users/user_show_spec.rb index a4db51497..4a56e3255 100644 --- a/spec/features/users/user_show_spec.rb +++ b/spec/features/users/user_show_spec.rb @@ -22,7 +22,8 @@ feature 'User profile page', :devise do      user.confirm!      login_as(user, :scope => :user)      visit organisation_user_path(user) -    expect(page).to have_content 'Mon Profil' +    # FIXME ref #819 +    # expect(page).to have_content 'Mon Profil'      expect(page).to have_content user.email    end | 
