Update namespace if user changed username. Dont move project if new record

Dmitriy Zaporozhets
1 parent 5ca17723
Showing 2 changed files with 7 additions and 1 deletions Show diff stats
app/observers/project_observer.rb
app/observers/user_observer.rb
 class ProjectObserver < ActiveRecord::Observer
   def before_save(project)
     # Move repository if namespace changed
-    if project.namespace_id_changed?
+    if project.namespace_id_changed? and not project.new_record?
       move_project(project)
     end
   end
@@ -9,6 +9,12 @@ class UserObserver &lt; ActiveRecord::Observer
     log_info("User \"#{user.name}\" (#{user.email})  was removed")
   end
+  def after_save user
+    if user.username_changed?
+      user.namespace.update_attributes(code: user.username)
+    end
+  end
+
   protected
   def log_info message
1	class ProjectObserver < ActiveRecord::Observer	1	class ProjectObserver < ActiveRecord::Observer
2	def before_save(project)	2	def before_save(project)
3	# Move repository if namespace changed	3	# Move repository if namespace changed
4	- if project.namespace_id_changed?	4	+ if project.namespace_id_changed? and not project.new_record?
5	move_project(project)	5	move_project(project)
6	end	6	end
7	end	7	end
	@@ -9,6 +9,12 @@ class UserObserver < ActiveRecord::Observer		@@ -9,6 +9,12 @@ class UserObserver < ActiveRecord::Observer
9	log_info("User \"#{user.name}\" (#{user.email}) was removed")	9	log_info("User \"#{user.name}\" (#{user.email}) was removed")
10	end	10	end
11		11
		12	+ def after_save user
		13	+ if user.username_changed?
		14	+ user.namespace.update_attributes(code: user.username)
		15	+ end
		16	+ end
		17	+
12	protected	18	protected
13		19
14	def log_info message	20	def log_info message