forgeos_core 1.9.2 → 1.9.3

data/app/assets/stylesheets/forgeos/jstree/themes/categories/style.css.sass

@@ -2,7 +2,6 @@
   ul
     padding: 0
     margin: 0
-
   li
     margin: 2px 0
     width: auto !important
@@ -36,7 +35,7 @@
           color: #F16028
       ins.jstree-icon
         margin: 0
-        background-image: url(/assets/forgeos/admin/big-icons-24-24-verti.png) !important
+        background-image: url(/assets/forgeos/admin/big-icons-24-24-verti.png)
         background-repeat: no-repeat
         width: 25px
         background-position: 0 -271px
@@ -69,45 +68,40 @@
 
 .jstree-categories-context
   width: 160px
-  background: #FFF
-  border: 1px solid #AEB0B2
+  background: white
+  border: 1px solid #aeb0b2
   position: absolute
   border-bottom: 0
-
   a
     display: block
     text-decoration: none
-    border-bottom: 1px solid #AEB0B2
+    border-bottom: 1px solid #aeb0b2
     color: black
     line-height: 20px
     margin: 0
-
     &.jstree-disabled:hover
       display: block
       text-decoration: none
-      border-bottom: 1px solid #AEB0B2
+      border-bottom: 1px solid #aeb0b2
       color: black
       line-height: 20px
       padding: 1px 0 1px 25px
       margin: 0
-
     &:hover
-      background-color: #D6EDF4
-      color: #2973BD
-      border-bottom: 1px solid #AEB0B2
-
+      background-color: #d6edf4
+      color: #2973bd
+      border-bottom: 1px solid #aeb0b2
     &.jstree-disabled
       color: silver
       opacity: 0.5
-      -ms-filter: 'alpha(opacity=50)'
-      filter: alpha(opacity=50)
+      -ms-filter: "alpha(opacity=50)"
+      filter: alpha(opacity = 50)
       zoom: 1
-
       &:hover
         color: silver
         opacity: 0.5
-        -ms-filter: 'alpha(opacity=50)'
-        filter: alpha(opacity=50)
+        -ms-filter: "alpha(opacity=50)"
+        filter: alpha(opacity = 50)
         zoom: 1
     ins
       &.create

data/app/controllers/admin/administrators_controller.rb

@@ -85,7 +85,7 @@ private
 
     if params[:category_id]
       conditions[:categories_elements] = { :category_id => params[:category_id] }
-      includes << :admin_categories
+      includes << :categories
     end
 
     includes << :role if order_column == 2
@@ -98,7 +98,7 @@ private
       options[:star] = true
       @admins = Administrator.search(params[:sSearch],options)
     else
-      @admins = Administrator.paginate(:all,options)
+      @admins = Administrator.paginate(options)
     end
   end
 end

data/app/controllers/admin/attachments_controller.rb

@@ -126,7 +126,7 @@ class Admin::AttachmentsController < Admin::BaseController
     end
     respond_to do |wants|
       wants.html do
-        redirect_to(forgeos_core.admin_attachments_path(:file_type => @media.class.to_s.underscore))
+        redirect_to([forgeos_core, :admin, @media.class.to_s.underscore.pluralize])
       end
       wants.js
     end
@@ -178,7 +178,7 @@ class Admin::AttachmentsController < Admin::BaseController
     # category
     if params[:category_id]
       conditions[:categories_elements] = { :category_id => params[:category_id] }
-      includes << :attachment_categories
+      includes << :categories
     end
     if params[:ids]
       conditions[:attachments] = { :id => params[:ids].split(',') }
@@ -192,7 +192,7 @@ class Admin::AttachmentsController < Admin::BaseController
       options[:star] = true
       @medias = type.search(params[:sSearch],options)
     else
-      @medias = type.paginate(:all,options)
+      @medias = type.paginate(options)
     end
   end
 

data/app/controllers/admin/categories_controller.rb

@@ -146,7 +146,7 @@ private
       options[:sql_order] = options.delete(:order)
       @categories = Category.search(params[:sSearch], options)
     else
-      @categories = Category.paginate(:all, options)
+      @categories = Category.paginate(options)
     end
   end
 end

data/app/controllers/admin/person_sessions_controller.rb

@@ -14,7 +14,7 @@ class Admin::PersonSessionsController < Admin::BaseController
       flash[:error] = t('log.in.failed').capitalize
     end
 
-    redirect_to_stored_location(:admin_root)
+    redirect_to_stored_location([forgeos_core, :admin, :root])
   end
 
   def destroy

data/app/controllers/admin/rights_controller.rb

@@ -89,7 +89,7 @@ private
 
     if params[:category_id]
       conditions[:categories_elements] = { :category_id =>  params[:category_id] }
-      includes << :right_categories
+      includes << :categories
     end
 
     options[:conditions] = conditions unless conditions.empty?
@@ -100,7 +100,7 @@ private
       options[:star] = true
       @rights = Right.search(params[:sSearch],options)
     else
-      @rights = Right.paginate(:all,options)
+      @rights = Right.paginate(options)
     end
   end
 end

data/app/controllers/admin/roles_controller.rb

@@ -100,11 +100,11 @@ private
 
     if params[:category_id]
       conditions[:categories_elements] = { :category_id => params[:category_id] }
-      includes << :role_categories
+      includes << :categories
     end
 
     if order_column == 2
-      includes << :administrators 
+      includes << :administrators
       group_by << 'roles.id'
     end
 
@@ -117,7 +117,7 @@ private
       options[:star] = true
       @roles = Role.search(params[:sSearch],options)
     else
-      @roles = Role.paginate(:all,options)
+      @roles = Role.paginate(options)
     end
   end
 end

data/app/controllers/admin/users_controller.rb

@@ -187,7 +187,7 @@ private
 
     if params[:category_id]
       conditions[:categories_elements] = { :category_id => params[:category_id] }
-      includes << :user_categories
+      includes << :categories
     end
 
     if params[:ids]
@@ -201,7 +201,7 @@ private
       options[:star] = true
       @users = User.search(params[:sSearch],options)
     else
-      @users = User.paginate(:all,options)
+      @users = User.paginate(options)
     end
   end
 end

data/app/controllers/forgeos/application_controller.rb

@@ -65,7 +65,7 @@ class Forgeos::ApplicationController < ActionController::Base
     session[:return_to] = request.fullpath
   end
 
-  def redirect_to_stored_location(default_path = :login, &block)
+  def redirect_to_stored_location(default_path = [forgeos_core, :login], &block)
     if redirect = session[:return_to]
       session[:return_to] = nil
       redirect_to(redirect)

data/app/models/category.rb

@@ -4,6 +4,10 @@ class Category < ActiveRecord::Base
   has_and_belongs_to_many_attachments
   acts_as_list :scope => [:type]
 
+  validates_each :parent_id do |record, attr, value|
+    record.errors.add(attr, 'Can\'t be his self parent') if record.id == value
+  end
+
   def level
     return self.ancestors.length
   end
@@ -22,16 +26,16 @@ class Category < ActiveRecord::Base
 
   def category_picture
     unless self.attachments.empty?
-      "background-image: url('#{self.attachments.first.public_filename(:categories_icon)}') !important;background-position: 0 3px"
+      self.attachments.first.public_filename(:categories_icon)
     else
-      nil
+      'folder'
     end
   end
 
   def to_jstree
     hash = {}
     hash[:attr] = { :id => "#{self.class.to_s.underscore}_#{id}", :type => 'folder' }
-    hash[:data] = { :title => name, :attr => { :style => category_picture, :title => total_elements_count } }
+    hash[:data] = { :title => name, :icon => category_picture, :attr => { :title => total_elements_count } }
     unless children.empty?
      hash[:children] = children.all(:order => 'position ASC').collect(&:to_jstree)
     end

data/app/models/right.rb

@@ -1,7 +1,7 @@
 class Right < ActiveRecord::Base
   has_and_belongs_to_many :roles
 
-  has_and_belongs_to_many :right_categories, :readonly => true, :join_table => 'categories_elements', :foreign_key => 'element_id', :association_foreign_key => 'category_id'
+  has_and_belongs_to_many :categories, :readonly => true, :join_table => 'categories_elements', :foreign_key => 'element_id', :association_foreign_key => 'category_id'
 
   #check that fields have data in them
   validates :name, :controller_name, :action_name, :presence => true

data/app/models/role.rb

@@ -4,7 +4,7 @@ class Role < ActiveRecord::Base
 
   validates :name, :presence => true
 
-  has_and_belongs_to_many :role_categories, :readonly => true, :join_table => 'categories_elements', :foreign_key => 'element_id', :association_foreign_key => 'category_id'
+  has_and_belongs_to_many :categories, :readonly => true, :join_table => 'categories_elements', :foreign_key => 'element_id', :association_foreign_key => 'category_id'
 
   define_index do
     indexes name, :sortable => true

data/app/models/user.rb

@@ -3,10 +3,13 @@ class User < Person
   accepts_nested_attributes_for :addresses
   attr_accessible :addresses_attributes
 
-  has_and_belongs_to_many :user_categories, :readonly => true, :join_table => 'categories_elements', :foreign_key => 'element_id', :association_foreign_key => 'category_id'
-  
+  has_and_belongs_to_many :categories,
+    :readonly => true,
+    :join_table => 'categories_elements',
+    :foreign_key => 'element_id',
+    :association_foreign_key => 'category_id'
+
   def age
     ((Date.today - self.birthday) / 365).floor
   end
-  
 end

data/app/views/admin/administrators/index.json.erb

@@ -1,6 +1,8 @@
 <%
   output = {
-    :iTotalDisplayRecords => @admins.total_entries || 0,
+    :sEcho => params[:sEcho],
+    :iTotalRecords => @admins.total_entries || 0,
+    :iTotalDisplayRecords => @admins.size,
     :aaData => @admins.collect do |admin|
       link_id = "admin_#{admin.id}"
       klass = admin.active? ? 'see-on' : 'see-off'

data/app/views/admin/attachments/_attachments_popup.html.haml

@@ -17,10 +17,10 @@
     uploadify_datas[window._forgeos_js_vars.session_key] = window._forgeos_js_vars.session;
 
     jQuery('#imageUpload').uploadify({
-      "uploader": "/assets/forgeos/uploadify/uploadify.swf",
-      "cancelImg": "#{image_path("forgeos/admin/big-icons/delete-icon.png")}",
-      "script": "#{forgeos_core.admin_attachments_path(:file_type => "picture")}",
-      "buttonImg": "#{image_path("forgeos/uploadify/upload-#{file_type}_#{I18n.locale}.png")}",
+      "uploader": '/assets/forgeos/uploadify/uploadify.swf',
+      "cancelImg": '/assets/forgeos/admin/big-icons/delete-icon.png',
+      "script": "#{forgeos_core.admin_pictures_path}",
+      "buttonImg": '/assets/forgeos/uploadify/upload-#{file_type}_#{I18n.locale}.png',
       "width": "154",
       "height": "24",
       "scriptData": uploadify_datas,

data/app/views/admin/attachments/_form.html.haml

@@ -3,7 +3,7 @@
   .backgrounds.big-header
     = f.text_field :name, :id => 'media-title', :class => 'field_name'
     .interact-links
-      = Forgeos_save_buttons forgeos_core.admin_attachments_path(:file_type => find_media_type_from_content_type(media) )
+      = Forgeos_save_buttons [forgeos_core, :admin, find_media_type_from_content_type(media).pluralize]
 
   #content.grid_16.alpha.omega
     #media-modify.grid_12.alpha

data/app/views/admin/attachments/_tabs.html.haml

@@ -4,4 +4,4 @@
     - if (file_type == @file_type.to_s) || (@media && file_type == @media.class.to_s.downcase)
       %li.ui-state-default.ui-corner-top.ui-tabs-selected.ui-state-active= link_to span, '#content'
     - else
-      %li.ui-state-default.ui-corner-top= link_to span, forgeos_core.admin_attachments_path(:file_type => file_type)
+      %li.ui-state-default.ui-corner-top= link_to span, [forgeos_core, :admin, file_type.pluralize.to_sym]

data/app/views/admin/attachments/index.json.erb

@@ -1,13 +1,15 @@
 <%
   output = {
-    :iTotalDisplayRecords => @medias.total_entries || 0,
+    :sEcho => params[:sEcho],
+    :iTotalRecords => @medias.total_entries || 0,
+    :iTotalDisplayRecords => @medias.size,
     :aaData => @medias.collect do |media|
       link_id = "attachment_#{media.id}"
       media_array = []
       if params[:skin] == 'thumbnail'
         media_array << render(:partial => 'table_thumbnail.html.haml', :locals => { :media => media })
       else
-        media_array << content_tag(params[:mode] == 'selection' ? :span: :div, '<div class="handler"></div><div class="small-icons '+ @file_type +'"></div>', :id => link_id, :class => "handler_container") <<
+        media_array << content_tag((params[:mode] == 'selection' ? :span : :div), content_tag(:div, '', :class=>"handler") + content_tag(:div, '', :class=>"small-icons #{@file_type}"), :id => link_id, :class => "handler_container") <<
         content_tag(:div, params[:mode] == 'selection' ? media.filename : link_to(media.name, [forgeos_core, :edit, :admin, media], :class => "truncate", :title => media.filename), :class => 'media-name') <<
         media.file_type.upcase <<
         media.updated_at.to_s(:short) <<

data/app/views/admin/attachments/show.html.haml

@@ -6,7 +6,7 @@
     .interact-links
       = link_to I18n.t('media.update.action').capitalize, [forgeos_core, :edit, :admin, @media ], :class => 'backgrounds interact-button'
       = I18n.t('or')
-      = link_to I18n.t('media.back').capitalize, forgeos_core.admin_attachments_path(:file_type => find_media_type_from_content_type(@media) ), :class => 'back-link'
+      = link_to I18n.t('media.back').capitalize, [forgeos_core, :admin, find_media_type_from_content_type(@media).pluralize], :class => 'back-link'
 
   #content.grid_16.alpha.omega
     #media-modify.grid_12.alpha

data/app/views/admin/cachings/index.html.haml

@@ -1,7 +1,7 @@
 = render :partial => 'tabs'
 
 #content.grid_16.alpha.omega
-  = form_for :caching do |f|
+  = form_for :caching, :url => [forgeos_core, :admin, :cachings] do |f|
     .backgrounds.header
       .interact-links
         = f.submit t('caching.delete.one').capitalize, :class => 'backgrounds interact-button'
@@ -11,4 +11,4 @@
         = check_box_tag "file[#{index}]", file[1]
         = file[0]
         = hidden_field_tag "hidden_files[#{index}]", file[1]
-        .clear
+        .clear

data/app/views/admin/categories/index.json.erb

@@ -1,6 +1,8 @@
 <%
   output = {
-    :iTotalDisplayRecords => @categories.total_entries || 0,
+    :sEcho => params[:sEcho],
+    :iTotalRecords => @categories.total_entries || 0,
+    :iTotalDisplayRecords => @categories.size,
     :aaData => @categories.collect do |category|
       link_id = "menu_link_#{category.id}"
       [

data/app/views/admin/import/_tabs.html.haml

@@ -3,3 +3,4 @@
   %li.ui-state-default.ui-corner-top= link_to t(:role, :count => 2).capitalize, [forgeos_core,:admin,:roles]
   %li.ui-state-default.ui-corner-top= link_to t(:right, :count => 2).capitalize, forgeos_core.admin_rights_path
   %li.ui-state-default.ui-corner-top.ui-tabs-selected.ui-state-active= link_to t(:import, :count => 1).capitalize, '#content'
+  %li.ui-state-default.ui-corner-top= link_to t(:caching, :count => 1).capitalize, forgeos_core.admin_cachings_path

data/app/views/admin/import/index.html.haml

@@ -1,6 +1,6 @@
 = render :partial => 'admin/menus/lang_switcher'
 = render :partial => 'tabs'
-- form_tag({ :action => :create } , :multipart => true, :id => 'import_form') do
+= form_tag([forgeos_core, :admin, :import] , :multipart => true, :id => 'import_form') do
   .backgrounds.big-header
     .interact-links
       = fg_submit_tag 'import.send_file'

data/app/views/admin/rights/_tabs.html.haml

@@ -3,3 +3,4 @@
   %li.ui-state-default.ui-corner-top= link_to t(:role, :count => 2).capitalize, [forgeos_core,:admin,:roles]
   %li.ui-state-default.ui-corner-top.ui-tabs-selected.ui-state-active= link_to t(:right, :count => 2).capitalize, '#content'
   %li.ui-state-default.ui-corner-top= link_to t(:import, :count => 1).capitalize, forgeos_core.admin_import_path
+  %li.ui-state-default.ui-corner-top= link_to t(:caching, :count => 1).capitalize, forgeos_core.admin_cachings_path

data/app/views/admin/rights/index.json.erb

@@ -1,18 +1,20 @@
 <%
   output = {
-    :iTotalDisplayRecords => @rights.total_entries || 0,
+    :sEcho => params[:sEcho],
+    :iTotalRecords => @rights.total_entries || 0,
+    :iTotalDisplayRecords => @rights.size,
     :aaData => @rights.collect do |right|
       link_id = "right_#{right.id}"
       [
         content_tag(:div,
-          tag(:div, :class => 'handler') +
-          tag(:div, :id => link_id, :class => 'small-icons right-ico'),
+          content_tag(:div, '', :class => 'handler') +
+          content_tag(:div, '', :id => link_id, :class => 'small-icons right-ico'),
           :class => 'handler_container'),
         content_tag(:div, right.name, :class => 'right-name'),
         right.controller_name,
         right.action_name,
-        content_tag(:span, '&nbsp;', :class => 'small-icons duplicate-link duplicate-right') +
-        content_tag(:span, '&nbsp;', :class => 'small-icons edit-link edit-right') +
+        content_tag(:span, "&nbsp;".html_safe, :class => 'small-icons duplicate-link duplicate-right') +
+        content_tag(:span, "&nbsp;".html_safe, :class => 'small-icons edit-link edit-right') +
         link_to('', [forgeos_core, :admin, right],
           :remote => true,
           :method => :delete,

data/app/views/admin/roles/_tabs.html.haml

@@ -3,3 +3,4 @@
   %li.ui-state-default.ui-corner-top.ui-tabs-selected.ui-state-active= link_to t(:role, :count => 2).capitalize, '#content'
   %li.ui-state-default.ui-corner-top= link_to t(:right, :count => 2).capitalize, forgeos_core.admin_rights_path
   %li.ui-state-default.ui-corner-top= link_to t(:import, :count => 1).capitalize, forgeos_core.admin_import_path
+  %li.ui-state-default.ui-corner-top= link_to t(:caching, :count => 1).capitalize, forgeos_core.admin_cachings_path

data/app/views/admin/roles/index.json.erb

@@ -1,13 +1,15 @@
 <%
   output = {
-    :iTotalDisplayRecords => @roles.total_entries || 0,
+    :sEcho => params[:sEcho],
+    :iTotalRecords => @roles.total_entries || 0,
+    :iTotalDisplayRecords => @roles.size,
     :aaData => @roles.collect do |role|
       link_id = "role_#{role.id}"
       klass = role.active? ? 'see-on' : 'see-off'
       [
-        content_tag(:div, '<div class="image">&nbsp;<span class="small-icons role-ico">&nbsp;</span></div>', :id => link_id, :class => role.administrators.count > 0 ? 'some-variants plus' : ''),
+        content_tag(:div, '<div class="image">&nbsp;<span class="small-icons role-ico">&nbsp;</span></div>'.html_safe, :id => link_id, :class => role.administrators.count > 0 ? 'some-variants plus' : ''),
         content_tag(:div, link_to(role.name, [forgeos_core, :edit, :admin, role]), :class => 'role-name') +
-          content_tag(:p,role.administrators.all.collect{ |admin| link_to("#{admin.firstname} #{admin.lastname}", [forgeos_core, :admin, admin]) }.join('<br />') , :style=>'display:none'),
+          content_tag(:p,role.administrators.all.collect{ |admin| link_to("#{admin.firstname} #{admin.lastname}", [forgeos_core, :admin, admin]) }.join('<br />').html_safe, :style=>'display:none'),
         role.administrators.count,
         role.created_at.to_s(:short),
         link_to('', [forgeos_core, :activate ,:admin, role],