Moved 'icon' from Role to Role property.

zena · May 16, 2011 · dfeeaaf · dfeeaaf
1 parent ecaa70b
commit dfeeaaf
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/app/models/role.rb b/app/models/role.rb
@@ -28,6 +28,11 @@ class Role < ActiveRecord::Base
   # We use property to store index information, default values and such
   include Property
 
+  property do |p|
+    p.string 'icon'
+  end
+  safe_property :icon
+
   class << self
     def export
       {'Node' => VirtualClass['Node'].export}
@@ -155,6 +160,12 @@ def real_class?
     false
   end
 
+  def icon=(txt)
+    # FIXME: remove gsub when we stop using ImageBuilder on
+    # icon images. SECURITY
+    self.icon = txt.gsub('..', '.')
+  end
+
   def superclass
     if new_record?
       Node

diff --git a/app/models/virtual_class.rb b/app/models/virtual_class.rb
@@ -307,10 +307,6 @@ def export
     res
   end
 
-  def icon=(txt)
-    self[:icon] = txt.gsub('..', '.') # SECURITY
-  end
-
   # check inheritance chain through kpath
   def kpath_match?(kpath)
     self.kpath =~ /^#{kpath}/

diff --git a/bricks/zena/zena/migrate/03_zerox1_data.rb b/bricks/zena/zena/migrate/03_zerox1_data.rb
@@ -357,6 +357,16 @@ def self.up
 
     execute "UPDATE roles SET type = 'VirtualClass'"
 
+    native_key = 'icon'
+    prop_key   = 'icon'
+    VClassMig.all.each do |rec|
+      value = rec[native_key]
+      next if value.blank?
+      prop  = rec.prop
+      prop[prop_key] = value
+      Zena::Db.execute "UPDATE #{rec.class.table_name} SET properties=#{Zena::Db.quote(rec.class.encode_properties(prop))} WHERE id=#{rec[:id]}"
+    end
+
     puts %q{
 ======== Migration succeded.
 ***********************************************************************************