diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 7fb6b110..203ee909 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -20,7 +20,9 @@ class UsersController < ApplicationController #@user.settings.metacodes=@m.split(',') @user.save - + + sign_in(@user, :bypass => true) + respond_with(@user, location: session[:previous_url]) do |format| end end diff --git a/app/controllers/users_controller.rb~ b/app/controllers/users_controller.rb~ index 799e3cc9..7e2ea491 100644 --- a/app/controllers/users_controller.rb~ +++ b/app/controllers/users_controller.rb~ @@ -16,9 +16,12 @@ class UsersController < ApplicationController @user = current_user @user.attributes = params[:user] - - @user.save + #@m = params[:metacodes][:value] + #@user.settings.metacodes=@m.split(',') + @user.save + + respond_with(@user, location: session[:previous_url]) do |format| end end diff --git a/app/views/users/REMOVED b/app/views/users/REMOVED index 64aba5e9..3307ca1a 100644 --- a/app/views/users/REMOVED +++ b/app/views/users/REMOVED @@ -95,3 +95,7 @@ $(document).ready(function() { }); + +FROM USERS CONTROLLER> +@m = params[:metacodes][:value] + @user.settings.metacodes=@m.split(',') diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index e2a4072b..1e21f9ff 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -14,5 +14,6 @@ <%= form.input :email, label: "Email", class: "email" %> <%= form.input :password, label: "Password", class: "password" %> <%= form.submit "Update", class: "update" %> + <% end %> diff --git a/app/views/users/edit.html.erb~ b/app/views/users/edit.html.erb~ index d98d6d96..0477ee56 100644 --- a/app/views/users/edit.html.erb~ +++ b/app/views/users/edit.html.erb~ @@ -13,7 +13,7 @@ <%= form.input :name, label: "Name", class: "name" %> <%= form.input :email, label: "Email", class: "email" %> <%= form.input :password, label: "Password", class: "password" %> - <%= hidden_field(:metacodes, :value, {:value => 0}) %> <%= form.submit "Update", class: "update" %> + <% :bypass=>true to sign_in(@user) %> <% end %> diff --git a/config/initializers/devise.rb~ b/config/initializers/devise.rb~ index 7b8b7510..8d8712bd 100644 --- a/config/initializers/devise.rb~ +++ b/config/initializers/devise.rb~ @@ -122,7 +122,7 @@ Devise.setup do |config| # Options to be passed to the created cookie. For instance, you can set # :secure => true in order to force SSL only cookies. - # config.rememberable_options = {} + config.rememberable_options = true # ==> Configuration for :validatable # Range for password length. Default is 8..128. @@ -198,7 +198,7 @@ Devise.setup do |config| # Set this configuration to false if you want /users/sign_out to sign out # only the current scope. By default, Devise signs out all scopes. - # config.sign_out_all_scopes = false + # config.sign_out_all_scopes = true # ==> Navigation configuration # Lists the formats that should be treated as navigational. Formats like