ghaymah_dev/postal
1
1
Fork 0
mirror of https://github.com/postalserver/postal.git synced 2026-10-18 18:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

be more precise about the presence of the invite parameter

Browse Source 
closes #1001
closes #1002
This commit is contained in:
Adam Cooke
2020-07-17 10:29:58 +01:00
parent 138f1c0983
commit a4bdafac13
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/users_controller.rb
+1 -1
View File
@@ -2,7 +2,7 @@ class UsersController < ApplicationController
include WithinOrganization include WithinOrganization
before_action :require_organization_admin before_action :require_organization_admin
before_action :require_organization_owner, :only => [:make_owner] before_action :require_organization_owner, :only => [:make_owner]
before_action { params[:id] && @user = params[:invite] ? organization.user_invites.find_by_uuid!(params[:id]) : organization.users.find_by_uuid!(params[:id]) } before_action { params[:id] && @user = params[:invite].present? ? organization.user_invites.find_by_uuid!(params[:id]) : organization.users.find_by_uuid!(params[:id]) }
def index def index
@users = organization.organization_users.where(:user_type => 'User').includes(:user).to_a.sort_by { |u| "#{u.user.first_name}#{u.user.last_name}".upcase } @users = organization.organization_users.where(:user_type => 'User').includes(:user).to_a.sort_by { |u| "#{u.user.first_name}#{u.user.last_name}".upcase }