Don't extract too much

Author: root

Diff for: app/controllers/gitolite_public_keys_controller.rb

@@ -18,7 +18,6 @@ def index
   def create
     if params[:create_button]
       @gitolite_public_key = @user.gitolite_public_keys.new(params[:gitolite_public_key])
-      @gitolite_public_key.identifier = GeneratePublicKeyIdentifier.new(@gitolite_public_key, @user).call
       if @gitolite_public_key.save
         create_ssh_key(@gitolite_public_key)
         flash[:notice] = l(:notice_public_key_created, title: view_context.keylabel(@gitolite_public_key))

Diff for: app/models/gitolite_public_key.rb

@@ -37,6 +37,7 @@ class GitolitePublicKey < ActiveRecord::Base
   before_validation :strip_whitespace
   before_validation :remove_control_characters
 
+  before_validation :set_identifier
   before_validation :set_fingerprint
 
 
@@ -144,6 +145,17 @@ def remove_control_characters
     end
 
 
+    # Returns the unique identifier for this key based on the key_type
+    #
+    # For user public keys, this simply is the user's gitolite_identifier.
+    # For deployment keys, we use an incrementing number.
+    #
+    def set_identifier
+      return nil if user_id.nil?
+      self.identifier ||= GeneratePublicKeyIdentifier.new(self, user).call
+    end
+
+
     def set_fingerprint
       begin
         self.fingerprint = RedmineGitHosting::Utils.ssh_fingerprint(key)