merge:

[pettanr/pettanr.git] / app / assets / javascripts / models / story.js.coffee

diff --git a/app/assets/javascripts/models/story.js.coffee b/app/assets/javascripts/models/story.js.coffee
index df37247..ba4f06c 100644 (file)
--- a/app/assets/javascripts/models/story.js.coffee
+++ b/app/assets/javascripts/models/story.js.coffee
@@ -14,7 +14,12 @@ class Pettanr.Story extends Peta.Binder
   } \r
   \r
   author: () ->\r
-    new Pettanr.Author({id: @get('author_id')})\r
+    new Pettanr.Cache.Retriever(Pettanr.Author, @get('author_id'))\r
+  \r
+  overwrite: (options) ->\r
+    operators = options.operators\r
+    return false if not operators.author\r
+    @set('author_id', operators.author.id)\r
   \r
   is_visible: (operators) ->\r
     switch super(operators)\r
@@ -25,7 +30,8 @@ class Pettanr.Story extends Peta.Binder
       else\r
         @get('visible') > 0\r
   \r
-  initialize: () ->\r
+  initialize: (attr = {}, options = {}) ->\r
+    super(attr, options)\r
     if @id\r
       @url = @url + @id\r
   \r