class UsersController < ApplicationController
- skip_before_filter :find_object_by_uuid, :only => [:welcome, :activity, :storage]
+ skip_around_filter :require_thread_api_token, only: :welcome
+ skip_before_filter :check_user_agreements, only: [:welcome, :inactive]
+ skip_before_filter :check_user_profile, only: [:welcome, :inactive, :profile]
+ skip_before_filter :find_object_by_uuid, only: [:welcome, :activity, :storage]
before_filter :ensure_current_user_is_admin, only: [:sudo, :unsetup, :setup]
+ def show
+ if params[:uuid] == current_user.uuid
+ respond_to do |f|
+ f.html do
+ redirect_to(params[:return_to] || project_path(params[:uuid]))
+ end
+ end
+ else
+ super
+ end
+ end
+
def welcome
if current_user
- params[:action] = 'home'
- home
+ redirect_to (params[:return_to] || '/')
end
end
+ def inactive
+ if current_user.andand.is_invited
+ redirect_to (params[:return_to] || '/')
+ end
+ end
+
+ def profile
+ params[:offer_return_to] ||= params[:return_to]
+ end
+
def activity
@breadcrumb_page_name = nil
@users = User.limit(params[:limit] || 1000).all
end
end
- def manage_profile
- @profile_config = Rails.configuration.user_profile_form_fields
- user_prefs = User.limit(1).where(uuid: current_user.uuid).first.prefs
- @current_user_profile = user_prefs[:profile] if user_prefs
-
- respond_to do |f|
- f.html { render template: 'users/profile' }
- end
- end
-
- def update_profile
- user_prefs = User.limit(1).where(uuid: current_user.uuid).first.prefs
- @current_user_profile = user_prefs[:profile] if user_prefs
- @current_user_profile ||= {}
-
- profile_keys = []
- @profile_config = Rails.configuration.user_profile_form_fields
- @profile_config.andand.each do |entry|
- profile_keys << entry['key']
- end
-
- updated_profile = {}
- params.andand.each do |param|
- if profile_keys.include? param[0]
- if param[1].andand.size>0
- updated_profile['profile_'+param[0]] = param[1]
- end
- end
- end
-
- # current_user.update_attributes! prefs: @current_user_profile
- current_user.update_profile updated_profile
-
- respond_to do |f|
- f.html { render template: 'users/profile' }
- end
- end
-
protected
def find_current_links user