Skip to content

Commit d512172

Browse files
committed
Fixed non-standard condition that tripped-up SQLite3.
1 parent 468ae98 commit d512172

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Diff for: lib/git_hosting/patches/users_controller_patch.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ def edit_with_public_keys
6161

6262
# Add in values for viewing public keys:
6363
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}")
64+
@gitolite_user_keys = @user.gitolite_public_keys.active.user_key.find(:all,:order => 'title ASC, created_at ASC')
65+
@gitolite_deploy_keys = @user.gitolite_public_keys.active.deploy_key.find(:all,:order => 'title ASC, created_at ASC')
6666
@gitolite_public_keys = @gitolite_user_keys + @gitolite_deploy_keys
6767
@gitolite_public_key = @gitolite_public_keys.detect{|x| x.id == params[:public_key_id].to_i}
6868
if @gitolite_public_key.nil?

0 commit comments

Comments
 (0)