element

[pettanr/pettanr.git] / lib / peta / item.rb

diff --git a/lib/peta/item.rb b/lib/peta/item.rb
index e85876a..f9a3de7 100644 (file)
--- a/lib/peta/item.rb
+++ b/lib/peta/item.rb
@@ -86,14 +86,6 @@ module Peta
       {}
     end
     
-    def self.visible_count
-      self.count self.visible_count_options
-    end
-    
-    def self.visible_count_options
-      []
-    end
-    
     #InstanceMethods
     
     def item_name
@@ -150,31 +142,42 @@ module Peta
       true
     end
     
-    def pool
-      @pool
+    def editor
+      @editor
+    end
+    
+    def editor=(e)
+      @editor = e
+    end
+    
+    def pool_id
+      @pool_id || self.id
+    end
+    
+    def pool_id=(i)
+      @pool_id = i
     end
     
     def dom_id
-      self.new_record? ? '1' : self.id.to_s
+      self.pool_id.to_s
     end
     
     def dom_pool_type
       self.new_record? ? 'stored' : 'new'
     end
     
-    def dom_item_id column_name = nil
-      r = self.dom_pool_type + '-' + self.item_name + '-' + self.dom_id
-      r += '-' + column_name.to_s if column_name
-      r
+    def dom_item_id name = nil
+      r = [self.editor.eid, self.dom_pool_type, self.item_name, self.dom_id]
+      r += name.to_s if column_name
+      r.join '-'
     end
     
-    def tag_attributes column_name = nil, opt = {}
+    def tag_attributes name = nil, opt = {}
       r = {
         'data-pool_type' => self.dom_pool_type, 'data-id' => self.dom_id, 
         'data-item_name' => self.item_name
       }
-      r.merge!({'id' => self.dom_item_id(column_name)}) if self.pool
- #  'data-parent_dom_id' => self.parent.dom_item_id
+      r.merge!({'id' => self.dom_item_id(name)}) if self.editor
       r.merge!(opt)
       r
     end
@@ -185,14 +188,5 @@ module Peta
       )
     end
     
-    #render element by body
-    def any_tag_attributes name = nil, opt = {}
-      r = self.tag_attributes(name)
-      r.merge!(
-        {:new_index => self.tag_new_index}
-      ) if self.new_index
-      r.merge(opt)
-    end
-    
   end
 end