1
0
مراية لـ https://github.com/postalserver/postal.git تم المزامنة 2025-12-01 05:43:04 +00:00

be more precise about the presence of the invite parameter

closes #1001
closes #1002
هذا الالتزام موجود في:
Adam Cooke
2020-07-17 10:29:58 +01:00
الأصل 138f1c0983
التزام a4bdafac13

عرض الملف

@@ -2,7 +2,7 @@ class UsersController < ApplicationController
include WithinOrganization
before_action :require_organization_admin
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
@users = organization.organization_users.where(:user_type => 'User').includes(:user).to_a.sort_by { |u| "#{u.user.first_name}#{u.user.last_name}".upcase }