Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

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

diff --git a/app/assets/javascripts/models/panel.js.coffee b/app/assets/javascripts/models/panel.js.coffee
index 8bfd9d8..22102c5 100644 (file)
--- a/app/assets/javascripts/models/panel.js.coffee
+++ b/app/assets/javascripts/models/panel.js.coffee
@@ -14,9 +14,6 @@ class Pettanr.Panel extends Peta.Root
     publish: 0\r
   } \r
   \r
-  author: () ->\r
-    new Pettanr.Cache.Retriever(Pettanr.Author, @get('author_id'))\r
-  \r
   with_elements: () ->\r
     new Pettanr.Panel.WithElements({id: @get('id')})\r
   \r
@@ -58,6 +55,9 @@ class Pettanr.Panel extends Peta.Root
       r[pid] = true if not r[pid]\r
     r\r
   \r
+  label: (shorten_length) ->\r
+    @_label('caption', shorten_length)\r
+  \r
   initialize: (attr = {}, options = {}) ->\r
     super(attr, options)\r
     @set(attr)\r