We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 468ae98 commit d512172Copy full SHA for d512172
1 file changed
lib/git_hosting/patches/users_controller_patch.rb
@@ -61,8 +61,8 @@ def edit_with_public_keys
61
62
# Add in values for viewing public keys:
63
def set_public_key_values
64
- @gitolite_user_keys = @user.gitolite_public_keys.all(:order => 'title ASC, created_at ASC', :conditions => "active=1 && key_type=#{GitolitePublicKey::KEY_TYPE_USER}")
65
- @gitolite_deploy_keys = @user.gitolite_public_keys.all(:order => 'title ASC, created_at ASC', :conditions => "active=1 && key_type=#{GitolitePublicKey::KEY_TYPE_DEPLOY}")
+ @gitolite_user_keys = @user.gitolite_public_keys.active.user_key.find(:all,:order => 'title ASC, created_at ASC')
+ @gitolite_deploy_keys = @user.gitolite_public_keys.active.deploy_key.find(:all,:order => 'title ASC, created_at ASC')
66
@gitolite_public_keys = @gitolite_user_keys + @gitolite_deploy_keys
67
@gitolite_public_key = @gitolite_public_keys.detect{|x| x.id == params[:public_key_id].to_i}
68
if @gitolite_public_key.nil?
0 commit comments