Merge branch 'release/0.6.16.3'

ulmic · May 4, 2016 · ae66f2b · ae66f2b
2 parents e0ba226 + 1601ca4
commit ae66f2b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/decorators/redirect_rule_decorator.rb b/app/decorators/redirect_rule_decorator.rb
@@ -1,6 +1,10 @@
 class RedirectRuleDecorator < ApplicationDecorator
   delegate_all
 
+  def name
+    "#{url} -> #{redirect_to}"
+  end
+
   def self.collections
     [ :active ]
   end

diff --git a/lib/concerns/params_comparing_concern.rb b/lib/concerns/params_comparing_concern.rb
@@ -45,7 +45,9 @@ def comparing(hash1, hash2, prev_object = nil)
         end
         if value.is_a? Hash
           # because of nested values hash has one value (association_attributes)
-          comparison[key] = comparing hash2[key].values.first, value.values.first
+	  if hash2[key]
+	    comparison[key] = comparing hash2[key].values.first, value.values.first
+	  end
           next
         end
         unless hash2[key].to_s == value.to_s