From 415e533c8318f27c3fd623d9ed2151e70b9462bc Mon Sep 17 00:00:00 2001 From: Sergio Ocon Date: Wed, 31 Aug 2016 17:36:29 +0200 Subject: [PATCH 1/4] fixed devise error updating account --- app/controllers/application_controller.rb | 4 ++++ config/locales/es.yml | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index b7b5105..5819118 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -14,5 +14,9 @@ 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(:account_update) << :first_name + devise_parameter_sanitizer.for(:account_update) << :last_name + devise_parameter_sanitizer.for(:account_update) << :phone + devise_parameter_sanitizer.for(:account_update) << :password end end diff --git a/config/locales/es.yml b/config/locales/es.yml index d2818bb..00cdf83 100644 --- 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: From f145fcc4b99965f23c79cd0af64dea208560a620 Mon Sep 17 00:00:00 2001 From: Sergio Ocon Date: Wed, 31 Aug 2016 17:53:22 +0200 Subject: [PATCH 2/4] fixed rubocop errors in devise config --- Gemfile | 2 +- Gemfile.lock | 2 -- app/controllers/application_controller.rb | 9 ++------- app/views/admin/_system_admin_view.html.erb | 4 ++-- app/views/admin/dashboard.html.erb | 2 -- app/views/users/show.html.erb | 12 ++++++------ 6 files changed, 11 insertions(+), 20 deletions(-) diff --git a/Gemfile b/Gemfile index d9e676d..87e8eec 100644 --- 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 index c22deea..1792067 100644 --- 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/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 5819118..6e3abfd 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -11,12 +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(:account_update) << :first_name - devise_parameter_sanitizer.for(:account_update) << :last_name - devise_parameter_sanitizer.for(:account_update) << :phone - devise_parameter_sanitizer.for(:account_update) << :password + 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 index 4b78041..655f147 100644 --- a/app/views/admin/_system_admin_view.html.erb +++ b/app/views/admin/_system_admin_view.html.erb @@ -16,7 +16,7 @@
  • Cada usuario SÍ podrá borrar su cuenta.
    • - +
    \ No newline at end of file + From e2fd77797936d9fc33603b040830d09bf4824df5 Mon Sep 17 00:00:00 2001 From: Sergio Date: Wed, 31 Aug 2016 17:57:39 +0200 Subject: [PATCH 3/4] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e648f0c..79d8697 100644 --- 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) + ## 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. From fd28c5ceeeb459a48ef011c769846327967fc9c6 Mon Sep 17 00:00:00 2001 From: Sergio Date: Wed, 31 Aug 2016 18:31:57 +0200 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 79d8697..95aba66 100644 --- a/README.md +++ b/README.md @@ -1,6 +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.