Merge branch 'master' of github.com:warpc/rosa-build

app/models/role.rb

@@ -90,7 +90,7 @@ class Role < ActiveRecord::Base
       end
       a.rights = []
       a.attributes = fields
-      Permission.delete_all(:conditions => ['role_id = ?', a.id])
+      Permission.delete_all(['role_id = ?', a.id])
       rights.each do |con, acts|
         acts.each do |act|
           unless r = Right.where(:controller => con, :action => act)

app/models/user.rb

@@ -43,7 +43,7 @@ class User < ActiveRecord::Base
       update_ssh_key ssh_key_was, ssh_key
     end
   }
-  before_destroy { destroy_ssh_key(ssh_key) }
+  before_destroy { destroy_ssh_key(ssh_key) if ssh_key.present? }
   # after_create() { UserMailer.new_user_notification(self).deliver }
 
   class << self