From: yasushiito <yas@pen-chan.jp>
Date: Tue, 17 Dec 2013 02:35:37 +0000 (+0900)
Subject: work
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=36817b17b4d4845afca9676316d03667eb0f75e8;hp=43f4c0b5c97d2689a72851eba25bdf042ee81631;p=pettanr%2Fpettanr.git

work
---

diff --git a/app/assets/javascripts/manifest/work/lists.js.coffee.erb b/app/assets/javascripts/manifest/work/lists.js.coffee.erb
index b5c9165e..6a325df4 100644
--- a/app/assets/javascripts/manifest/work/lists.js.coffee.erb
+++ b/app/assets/javascripts/manifest/work/lists.js.coffee.erb
@@ -403,6 +403,9 @@
       public_list: {
         type: 'public',
       },
+      private_list: {
+        type: 'private',
+      },
       by_license: {
         type: 'filter',
         from: 'license',
diff --git a/app/models/original_picture.rb b/app/models/original_picture.rb
index 3004bb58..f29212cc 100644
--- a/app/models/original_picture.rb
+++ b/app/models/original_picture.rb
@@ -53,7 +53,8 @@ class OriginalPicture < Pettanr::Content
   end
   
   def revision
-    self.history.first.revision
+    head = self.history.first
+    head ? head.revision : 'unpublished'
   end
   
   def unpublished?
diff --git a/lib/manifest/list.rb b/lib/manifest/list.rb
index b47fbdae..59c0dfd5 100644
--- a/lib/manifest/list.rb
+++ b/lib/manifest/list.rb
@@ -40,7 +40,15 @@ module Pettanr
       end
       
       def includes
-        @owner_model ? {@owner_model.item_name => {}} : {}
+        if @owner_model
+          if @owner_model.owner_model
+            {@owner_model.item_name => {@owner_model.owner_model.item_name => {}}}
+          else
+            {@owner_model.item_name => {}}
+          end
+        else
+          {}
+        end
       end
       
       def order
@@ -69,10 +77,17 @@ module Pettanr
         when :artist
           operator = @operators.artist
         end
-        t = @owner_model ? @owner_table_name : @table_name
+        t = if @owner_model
+          if @owner_model.owner_model
+            @owner_model.owner_model.table_name
+          else
+            @owner_model.table_name
+          end
+        else
+          @table_name
+        end
         [t + '.' + @model.owner_type.to_s + '_id = ?', operator.id]
       end
-     
     end
     
     class HasManyList < BaseList
diff --git a/public/manifest.json b/public/manifest.json
index d8cc2075..7cf7b8e4 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -2973,6 +2973,9 @@
         "public_list": {
           "type": "public"
         },
+        "private_list": {
+          "type": "private"
+        },
         "scroll_panels": {
           "type": "has_many",
           "association_name": "scroll_panels"
@@ -3036,6 +3039,9 @@
         "public_list": {
           "type": "public"
         },
+        "private_list": {
+          "type": "private"
+        },
         "by_panel": {
           "type": "filter",
           "from": "panel",
@@ -3054,6 +3060,9 @@
         "public_list": {
           "type": "public"
         },
+        "private_list": {
+          "type": "private"
+        },
         "by_panel": {
           "type": "filter",
           "from": "panel",
@@ -3118,6 +3127,9 @@
         "public_list": {
           "type": "public"
         },
+        "private_list": {
+          "type": "private"
+        },
         "by_panel": {
           "type": "filter",
           "from": "panel",
@@ -3136,6 +3148,9 @@
         "public_list": {
           "type": "public"
         },
+        "private_list": {
+          "type": "private"
+        },
         "by_panel": {
           "type": "filter",
           "from": "panel",
@@ -3163,6 +3178,9 @@
         "public_list": {
           "type": "public"
         },
+        "private_list": {
+          "type": "private"
+        },
         "by_license": {
           "type": "filter",
           "from": "license",