diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 2b4db6d5846bd075a5483d4168af7e7bdbd656b2..878a16a6ddd17d01d5741d10a8169dbb1d50626f 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -185,8 +185,7 @@ header { border-top-right-radius: 7px; .btn, .btn:focus, .btn:hover { - max-height: 40px; - height: auto; + height: 40px; font-size: 18px; color: #FF2602; background-color: #FFF; @@ -368,8 +367,7 @@ header { border-top-right-radius: 7px; .btn, .btn:focus, .btn:hover { - max-height: 40px; - height: auto; + height: 40px; font-size: 18px; color: #FF2602; background-color: #FFF; diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 01444c6354dc42917e17f5ba68be5653841917cf..c6d5d44d873da16987a55192ba40c18659b6d098 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -21,7 +21,7 @@ class ApplicationController < ActionController::Base } elsif params[:action] == 'create' devise_parameter_sanitizer.for(:sign_up) { - |u| u.permit(registration_params) + |u| u.permit(registration_params << :terms_of_service) } end end diff --git a/app/controllers/management/users_controller.rb b/app/controllers/management/users_controller.rb index ba214e2a073b7a7c1cede017a36c210dbdf8dad4..c95e0fd21da0483d80cc4a462be9574e85fddff1 100644 --- a/app/controllers/management/users_controller.rb +++ b/app/controllers/management/users_controller.rb @@ -102,7 +102,7 @@ class Management::UsersController < ManagementController # Never trust parameters from the scary internet, only allow the white list through. def user_params - params.require(:user).permit(:name, :email, :password, :password_confirmation, role_ids: []) + params.require(:user).permit(:name, :email, :password, :password_confirmation, role_ids: [], :terms_of_service) end def set_roles diff --git a/app/models/user.rb b/app/models/user.rb index c671b088cdef4458c3e0492cf27ca520758b6d16..6686e9532147ae778b426276d60bd642ce8039f8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -31,6 +31,7 @@ class User < ActiveRecord::Base has_attached_file :avatar, styles: {medium: "300x300>", thumb: "60x60>"}, default_url: lambda { |image| ActionController::Base.helpers.asset_path('user-anon.png') } validates_attachment_content_type :avatar, content_type: /\Aimage\/.*\Z/ + validates :terms_of_service, acceptance: true searchkick language: 'brazilian', match: :word_start, searchable: [:name] diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 240332942717cb21d35086fe5a86ef9f250ac767..967341acc9224fded9b46000c1eec837b3f512a4 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -23,7 +23,7 @@ <em><p>(<%= @minimum_password_length %> caracteres mÃnimos)</p></em> <% end %></div></div> <div class="col-md-4 style-text">Confirmar Senha:</div><div class="col-md-8"><div class="style-input"><%= f.password_field :password_confirmation, autocomplete: "off", :class =>"style-input"%></div></div> - <div class="col-md-12 style-check"><%=check_box_tag 'Termos', {checked: true}%> Concondo com os termos de uso.<%=link_to " Ver termos de uso.", '#', {:class=>"style-link"}%></div> + <div class="col-md-12 style-check"><%=f.check_box :terms_of_service%> Concordo com os termos de uso.<%=link_to " Ver termos de uso.", '#', {:class=>"style-link"}%></div> </div> </div> </div> @@ -36,7 +36,7 @@ <span class="pull-right"><%= render "devise/shared/links"%></span> </div> <div class=" col-md-5"> - <br/><span class="pull-right"><%= f.submit "Cadastrar", :class=> "but but-shadow but-rc" %></span><br/> + <br/><span class="pull-right"><%= f.submit "Cadastrar", :class=> "but but-shadow but-rc"%></span><br/> </div> </div> </div>