forgeos_core 1.9.1 → 1.9.2

data/app/models/administrator.rbc

@@ -0,0 +1,415 @@
+!RBIX
+5362583714419577066
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+31
+99
+7
+0
+45
+1
+2
+65
+49
+3
+3
+13
+99
+12
+7
+4
+12
+7
+5
+12
+65
+12
+49
+6
+4
+15
+49
+4
+0
+15
+2
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+7
+x
+13
+Administrator
+x
+6
+Person
+n
+x
+10
+open_class
+x
+14
+__class_init__
+M
+1
+n
+n
+x
+13
+Administrator
+i
+120
+5
+66
+5
+7
+0
+47
+49
+1
+1
+15
+5
+7
+2
+44
+43
+3
+79
+49
+4
+1
+13
+7
+5
+7
+0
+49
+6
+2
+15
+47
+49
+7
+2
+15
+5
+7
+8
+7
+9
+47
+49
+10
+2
+15
+5
+7
+11
+44
+43
+3
+4
+4
+49
+4
+1
+13
+7
+12
+2
+49
+6
+2
+15
+13
+7
+13
+7
+14
+64
+49
+6
+2
+15
+13
+7
+15
+7
+16
+64
+49
+6
+2
+15
+13
+7
+17
+7
+18
+64
+49
+6
+2
+15
+47
+49
+19
+2
+15
+5
+7
+20
+47
+49
+21
+1
+15
+99
+7
+22
+7
+23
+65
+67
+49
+24
+0
+49
+25
+4
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+26
+x
+4
+role
+x
+10
+belongs_to
+x
+6
+rights
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+7
+through
+x
+3
+[]=
+x
+8
+has_many
+x
+9
+right_ids
+x
+7
+role_id
+x
+15
+attr_accessible
+x
+10
+categories
+x
+8
+readonly
+x
+10
+join_table
+s
+19
+categories_elements
+x
+11
+foreign_key
+s
+10
+element_id
+x
+23
+association_foreign_key
+s
+11
+category_id
+x
+23
+has_and_belongs_to_many
+x
+8
+activate
+x
+13
+before_create
+x
+12
+access_path?
+M
+1
+n
+n
+x
+12
+access_path?
+i
+11
+5
+48
+0
+20
+0
+20
+1
+49
+1
+2
+11
+I
+5
+I
+2
+I
+2
+I
+2
+n
+p
+2
+x
+6
+rights
+x
+39
+find_by_controller_name_and_action_name
+p
+5
+I
+-1
+I
+e
+I
+0
+I
+f
+I
+b
+x
+81
+/home/cyrill62/Sites/fcorer3/vendor/gems/forgeos_core/app/models/administrator.rb
+p
+2
+x
+10
+controller
+x
+6
+action
+x
+17
+method_visibility
+x
+15
+add_defn_method
+p
+25
+I
+2
+I
+2
+I
+a
+I
+3
+I
+22
+I
+4
+I
+2c
+I
+6
+I
+2f
+I
+a
+I
+38
+I
+7
+I
+40
+I
+8
+I
+4a
+I
+9
+I
+54
+I
+a
+I
+5d
+I
+6
+I
+62
+I
+c
+I
+6a
+I
+e
+I
+78
+x
+81
+/home/cyrill62/Sites/fcorer3/vendor/gems/forgeos_core/app/models/administrator.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+0
+I
+1
+I
+1f
+x
+81
+/home/cyrill62/Sites/fcorer3/vendor/gems/forgeos_core/app/models/administrator.rb
+p
+0

data/app/models/category.rb

@@ -24,14 +24,14 @@ class Category < ActiveRecord::Base
     unless self.attachments.empty?
       "background-image: url('#{self.attachments.first.public_filename(:categories_icon)}') !important;background-position: 0 3px"
     else
-      ''
+      nil
     end
   end
 
   def to_jstree
     hash = {}
-    hash[:attributes] = { :id => "#{self.class.to_s.underscore}_#{id}", :type => 'folder' }
-    hash[:data] = { :title => "#{name}<span>#{total_elements_count}</span>", :attributes => { :class => 'big-icons', :style => category_picture }}
+    hash[:attr] = { :id => "#{self.class.to_s.underscore}_#{id}", :type => 'folder' }
+    hash[:data] = { :title => name, :attr => { :style => category_picture, :title => total_elements_count } }
     unless children.empty?
      hash[:children] = children.all(:order => 'position ASC').collect(&:to_jstree)
     end

data/app/models/person.rb

@@ -40,28 +40,24 @@ class Person < ActiveRecord::Base
 
   # Disactivates the user in the database.
   def disactivate
-    self.active = false
-    save(false) unless self.new_record?
+    update_attribute(:active, false)
   end
 
   # Activates the user in the database.
   def activate
-    self.active = true
-    save(false) unless self.new_record?
+    update_attribute(:active, true)
   end
 
-  # return the user status
-  def active?
-    self.active
-  end
+  protected
 
-protected
   def skip_uniquess_of_email?
     true
   end
+
   def skip_presence_of_lastname?
     true
   end
+
   def skip_presence_of_firstname?
     true
   end