redux of valuators creation form

This commit is contained in:
Juanjo Bazán
2016-03-15 15:31:08 +01:00
committed by Juanjo Bazán
parent 57fba7c0df
commit 4546af5be1
8 changed files with 47 additions and 14 deletions

View File

@@ -19,9 +19,14 @@ class Admin::ValuatorsController < Admin::BaseController
end end
def create def create
@valuator.user_id = params[:user_id] @valuator = Valuator.new(create_params)
@valuator.save @valuator.save
redirect_to admin_valuators_path redirect_to admin_valuators_path
end end
private
def create_params
params.require(:valuator).permit(:user_id, :description)
end
end end

View File

@@ -1,7 +1,24 @@
<span><%= valuator.name %></span> <h3><%= t('admin.valuators.valuator.user_found') %>:</h3>
<div class="row">
<div class="small-12 medium-12 column">
<h4>
<%= valuator.name %>
<span class="bullet">&nbsp;&bull;&nbsp;</span> <span class="bullet">&nbsp;&bull;&nbsp;</span>
<span><%= valuator.email %></span> <%= valuator.email %>
<% unless valuator.persisted? %> </h4>
<%= link_to t('admin.valuators.valuator.add'),{ controller: "admin/valuators", action: :create, user_id: valuator.user_id }, </div>
method: :post, class: "button small success float-right" %>
<% unless @valuator.persisted? %>
<%= form_for @valuator, url: admin_valuators_path do |f| %>
<div class="row">
<div class="small-12 medium-4 column ">
<%= f.text_field :description, label: false, placeholder: "descripción (opcional)" %>
<%= f.hidden_field :user_id %>
</div>
<div class="small-12 medium-2 column end" style="border:ddotted 10px red;">
<%= f.submit t('admin.valuators.valuator.add'), class: "button success float-left" %>
</div>
</div>
<% end %> <% end %>
<% end %>
</div>

View File

@@ -16,7 +16,13 @@
<ul id="valuators" class="admin-list"> <ul id="valuators" class="admin-list">
<% @valuators.each do |valuator| %> <% @valuators.each do |valuator| %>
<li> <li>
<%= render 'valuator', valuator: valuator %> <span><%= valuator.name %></span>
<span class="bullet">&nbsp;&bull;&nbsp;</span>
<span><%= valuator.email %></span>
<% if valuator.description.present? %>
<span class="bullet">&nbsp;&bull;&nbsp;</span>
<span><%= valuator.description %></span>
<% end %>
</li> </li>
<% end %> <% end %>
</ul> </ul>

View File

@@ -1 +1 @@
$("#search-result").html("<div class=\"panel column\"><%= j render 'valuator', valuator: @valuator %></div>"); $("#search-result").html("<%= j render 'valuator', valuator: @valuator %>");

View File

@@ -1 +1 @@
$("#search-result").html("<div class=\"panel column\"><%= j t('admin.valuators.search.user_not_found') %></div>"); $("#search-result").html("<h4><%= j t('admin.valuators.search.user_not_found') %></h4>");

View File

@@ -74,7 +74,8 @@ en:
index: index:
title: Valuators title: Valuators
valuator: valuator:
add: Add user_found: User found
add: Add to valuators
search: search:
email_placeholder: Search user by email email_placeholder: Search user by email
search: Search search: Search

View File

@@ -74,7 +74,8 @@ es:
index: index:
title: Evaluadores title: Evaluadores
valuator: valuator:
add: Añadir user_found: Usuario encontrado
add: Añadir como evaluador
search: search:
email_placeholder: Buscar usuario por email email_placeholder: Buscar usuario por email
search: Buscar search: Buscar

View File

@@ -20,9 +20,12 @@ feature 'Admin valuators' do
click_button 'Search' click_button 'Search'
expect(page).to have_content @user.name expect(page).to have_content @user.name
click_link 'Add' fill_in 'valuator_description', with: 'environmental expert'
click_button 'Add to valuators'
within("#valuators") do within("#valuators") do
expect(page).to have_content @user.name expect(page).to have_content @user.name
expect(page).to have_content 'environmental expert'
end end
end end