ende 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e5baed74e4549285499cb1cb26ec883f3b195eb
-  data.tar.gz: a39621527f298f1a3a961d407bcf238c9dd13824
+  metadata.gz: fe497e8110c3ebd1a0f2febe90f6315ddc73e4af
+  data.tar.gz: a05f377460a7fa2eb2a43517672303926fb7858b
 SHA512:
-  metadata.gz: 1d2ebd1d32231ba1e4f76cd2d08f2136a4fc45aa0ba25c8605f971903b61f355b3ae17ad0ffd28f2e19553e49ded0b895255268a6d3004ab21870dcb9dd9c1d0
-  data.tar.gz: ba358650d4d19bcad4fc0cd3267ebfb8f7e72d5f76e6e999c6a02c46ee6b306d08595acb40e913a8aa750f8dc8cd9faa67990e18c769c213a07954bb41072753
+  metadata.gz: 7f7c939ac955877095f260c87055ea27010ae2a41d6846481e26ebdd60016c6341bcd5746c73f4eee17b785f67805f141d175284380a7d3b9dff607ec2898206
+  data.tar.gz: 1deb508015d642d59c4b127057dcc7f74167a2a7237074356587345422b8efdbb0ef7213e9b9c68990b7160adde8dc7893a3108ab41c762802341cb88521e988

data/lib/assets/javascripts/aura/extensions/devise.js.coffee

@@ -98,8 +98,8 @@ define 'aura/extensions/devise', () ->
           attributes = _.extend json, @json()
           for name, value of attributes
             if name.endsWith '_attributes'
-              actual_name = name.replace('_attributes', '')
-              attributes[actual_name] = value
+              actual_name = name.replace '_attributes', ''
+              attributes[actual_name] = _.extend {}, attributes[actual_name], attributes[name]
               delete attributes[name]
 
 

data/lib/assets/javascripts/widgets/viewer/main.js.coffee

@@ -181,7 +181,7 @@ define [
     presented = @scope.fetch null, (records) =>
 
       # TODO instantiate records before calling this callback
-      records = _.map records, @resource, @resource unless records[0]?.resource
+      records = _.map records, @resource, @resource unless records[0]?.resource or records[0]?.itemable
 
       # TODO implement Array.concat ou Array.merge in observer, and
       # use it here instead of pushing each record

data/lib/ende/version.rb

@@ -1,3 +1,3 @@
 module Ende
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end