set_identifier should be private

Author: root

Diff for: app/models/gitolite_public_key.rb

@@ -48,32 +48,6 @@ def to_s
   end
 
 
-  def set_identifier
-    self.identifier ||=
-      begin
-        my_time = Time.now
-        time_tag = "#{my_time.to_i.to_s}_#{my_time.usec.to_s}"
-        key_count = GitolitePublicKey.by_user(self.user).deploy_key.length + 1
-        case key_type
-          when KEY_TYPE_USER
-            # add "redmine_" as a prefix to the username, and then the current date
-            # this helps ensure uniqueness of each key identifier
-            #
-            # also, it ensures that it is very, very unlikely to conflict with any
-            # existing key name if gitolite config is also being edited manually
-            "#{self.user.gitolite_identifier}" << "@redmine_" << "#{time_tag}".gsub(/[^0-9a-zA-Z\-]/, '_')
-          when KEY_TYPE_DEPLOY
-            # add "redmine_deploy_key_" as a prefix, and then the current date
-            # to help ensure uniqueness of each key identifier
-            # "redmine_#{DEPLOY_PSEUDO_USER}_#{time_tag}".gsub(/[^0-9a-zA-Z\-]/, '_') << "@redmine_" << "#{time_tag}".gsub(/[^0-9a-zA-Z\-]/, '_')
-            "#{self.user.gitolite_identifier}_#{DEPLOY_PSEUDO_USER}_#{key_count}".gsub(/[^0-9a-zA-Z\-]/, '_') << "@redmine_" << "#{time_tag}".gsub(/[^0-9a-zA-Z\-]/, '_')
-          else
-            nil
-          end
-        end
-  end
-
-
   # Make sure that current identifier is consistent with current user login.
   # This method explicitly overrides the static nature of the identifier
   def reset_identifier
@@ -246,4 +220,30 @@ def key_uniqueness
     return true
   end
 
+
+  def set_identifier
+    self.identifier ||=
+      begin
+        my_time = Time.now
+        time_tag = "#{my_time.to_i.to_s}_#{my_time.usec.to_s}"
+        key_count = GitolitePublicKey.by_user(self.user).deploy_key.length + 1
+        case key_type
+          when KEY_TYPE_USER
+            # add "redmine_" as a prefix to the username, and then the current date
+            # this helps ensure uniqueness of each key identifier
+            #
+            # also, it ensures that it is very, very unlikely to conflict with any
+            # existing key name if gitolite config is also being edited manually
+            "#{self.user.gitolite_identifier}" << "@redmine_" << "#{time_tag}".gsub(/[^0-9a-zA-Z\-]/, '_')
+          when KEY_TYPE_DEPLOY
+            # add "redmine_deploy_key_" as a prefix, and then the current date
+            # to help ensure uniqueness of each key identifier
+            # "redmine_#{DEPLOY_PSEUDO_USER}_#{time_tag}".gsub(/[^0-9a-zA-Z\-]/, '_') << "@redmine_" << "#{time_tag}".gsub(/[^0-9a-zA-Z\-]/, '_')
+            "#{self.user.gitolite_identifier}_#{DEPLOY_PSEUDO_USER}_#{key_count}".gsub(/[^0-9a-zA-Z\-]/, '_') << "@redmine_" << "#{time_tag}".gsub(/[^0-9a-zA-Z\-]/, '_')
+          else
+            nil
+          end
+        end
+  end
+
 end