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

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

diff --git a/app/assets/javascripts/models/original_picture.js.coffee b/app/assets/javascripts/models/original_picture.js.coffee
index e228331..e6e457a 100644 (file)
--- a/app/assets/javascripts/models/original_picture.js.coffee
+++ b/app/assets/javascripts/models/original_picture.js.coffee
@@ -1,5 +1,4 @@
 class Pettanr.OriginalPicture extends Peta.Content\r
-  url: '/original_pictures/'\r
   \r
   @singular: () ->\r
     'OriginalPicture'\r
@@ -15,7 +14,10 @@ class Pettanr.OriginalPicture extends Peta.Content
   picture: () ->\r
     new Pettanr.Cache.Retriever(Pettanr.Picture, @get('picture_id'))\r
   \r
-  is_visible: (operators) ->\r
+  artist: () ->\r
+    new Pettanr.Cache.Retriever(Pettanr.Artist, @get('artist_id'))\r
+  \r
+  is_visible: (operators = Pettanr.cache.operators) ->\r
     @is_own(operators)\r
   \r
   filename: () ->\r
@@ -27,6 +29,9 @@ class Pettanr.OriginalPicture extends Peta.Content
   r_url: () ->\r
     '/original_pictures/' + @filename()\r
   \r
+  license_url: () ->\r
+    '/original_picture_license_groups/new/' + @get('id')\r
+  \r
   opt_img_tag: () ->\r
     {src: @r_url(), width: @get('width'), height: @get('height')}\r
   \r
@@ -89,19 +94,17 @@ class Pettanr.OriginalPicture extends Peta.Content
   \r
   initialize: (attr = {}, options = {}) ->\r
     super(attr, options)\r
-    if @id\r
-      @url = @url + @id\r
   \r
 class Pettanr.OriginalPicture.History extends Backbone.Collection\r
-  url: '/original_pictures/'\r
   \r
   initialize: (options) ->\r
     @original_picture = options.original_picture\r
     @model = Pettanr.Picture\r
-    @url = @url + @original_picture.get('id') + '/history'\r
+    @url = @original_picture.default_url() + '/history'\r
   \r
 class Pettanr.OriginalPicture.Head extends Backbone.View\r
   tagName: 'span'\r
+  \r
   initialize: (options) ->\r
     @original_picture = options.original_picture\r
     @pictures = new Pettanr.OriginalPicture.History({id: @original_picture.get('id')})\r