Merge branch 'master' into offs_controller_fix

propedeutica · Sep 1, 2016 · 5f0bd43 · 5f0bd43
2 parents 96c7332 + fd28c5c
commit 5f0bd43
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 17 deletions.
diff --git a/Gemfile b/Gemfile
@@ -112,7 +112,7 @@ gem 'devise', "~> 3.0" # 4.0 needs ruby 2.2
 
 # Let's get a copy of documentation
 # Generating guides requires Redcarpet 2.1.1+.
-gem 'redcarpet', '~> 2.1.1'
+# gem 'redcarpet', '~> 2.1.1'
 
 # Introducing Angular UI
 #gem "angular-ui-bootstrap-rails",     "~>1.3.0"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -176,7 +176,6 @@ GEM
       ffi (>= 0.5.0)
     rdoc (4.2.2)
       json (~> 1.4)
-    redcarpet (2.1.1)
     responders (1.1.2)
       railties (>= 3.2, < 4.2)
     rspec (3.5.0)
@@ -281,7 +280,6 @@ DEPENDENCIES
   rack (= 1.5.2)
   rails (~> 4.1)
   rake
-  redcarpet (~> 2.1.1)
   rspec-rails (~> 3.4)
   rubocop
   sass-rails (>= 3.5)

diff --git a/README.md b/README.md
@@ -1,4 +1,6 @@
 # Catequesis
+[![security](https://hakiri.io/github/propedeutica/lastablas/master.svg)](https://hakiri.io/github/propedeutica/lastablas/master)
+[![Build Status](https://travis-ci.org/propedeutica/lastablas.svg?branch=master)](https://travis-ci.org/propedeutica/lastablas)
 ## Introduction
 This application tries to make it possible to reserve places in church school or similar system. Parents can sign up and then add their offspring, and then ask for a particular shift where they want to be assigned.
 

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -11,8 +11,7 @@ class ApplicationController < ActionController::Base
   protected
 
   def configure_permitted_parameters
-    devise_parameter_sanitizer.for(:sign_up) << :first_name
-    devise_parameter_sanitizer.for(:sign_up) << :last_name
-    devise_parameter_sanitizer.for(:sign_up) << :phone
+    devise_parameter_sanitizer.for(:sign_up) << :first_name << :last_name << :phone
+    devise_parameter_sanitizer.for(:account_update) < :first_name << :last_name << :phone << :password
   end
 end
diff --git a/app/views/admin/_system_admin_view.html.erb b/app/views/admin/_system_admin_view.html.erb
@@ -16,7 +16,7 @@
                 <li> Cada usuario <b>SÍ</b> podrá borrar su cuenta. </li>
               </ol>
             </li>
-          </ul>  
+          </ul>
           <div>
             <input class="bootstrap-switch" id="bootstrap-switch-state" type="checkbox" checked>
             <script>
@@ -26,7 +26,7 @@
         </p>
       </div>
     </div>
-  </div> 
+  </div>
 
     <div style="float:left; width: 50%;">
       <div class="panel-heading">

diff --git a/app/views/admin/dashboard.html.erb b/app/views/admin/dashboard.html.erb
@@ -1,3 +1 @@
 <% provide(:title, 'Administración') %>
-
-
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
@@ -16,11 +16,11 @@
       <h2>Niños: (<%= @user.offsprings.count %>)</h2>
       <thead>
         <tr>
-          <th>Uno </th>
-          <th>Uno </th>
-          <th>Uno </th>
-          <th>Uno </th>
-          <th>Uno </th>
+          <th>Nombre</th>
+          <th>Apellidos</th>
+          <th>Curso</th>
+          <th>Padre o Tutor</th>
+          <th>Acciones</th>
         </tr>
       </thead>
       <tbody>
@@ -50,4 +50,4 @@
   $(document).ready(function() {
     $('.datatable').dataTable();
   });
-</script>
+</script>
diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -63,7 +63,9 @@ es:
               too_long: "demasiado largo"
               invalid: "no es válido"
               taken: "ya existe"
-            remember_me: "Recordarle"
+              remember_me: "Recordarle"
+            current_password:
+              blank: "no puede estar vacío"
         offspring:
           attributes:
             first_name: