forgeos_core 1.9.4 → 1.9.5.rc1

data/app/helpers/admin/base_helper.rb

@@ -146,4 +146,8 @@ module Admin::BaseHelper
       fg_submit_tag(label) + t('or') + link_to(t('cancel').capitalize, back_path, :class => 'back-link')
     end
   end
+
+  def polymorphic_html_id(object, prefix = '')
+    [prefix, object.class.to_s.underscore, object.id] * '_'
+  end
 end

data/app/helpers/{forgeos/application_helper.rb → application_helper.rb}

@@ -1,5 +1,5 @@
 # Methods added to this helper will be available to all templates in the application.
-module Forgeos::ApplicationHelper
+module ApplicationHelper
   def logged_in?
     current_user
   end
@@ -111,4 +111,22 @@ module Forgeos::ApplicationHelper
   def statistics_collector_tag(object)
     javascript_include_tag(forgeos_core.statistics_collector_path(:type => object.class.to_s.underscore, :id => object.id))
   end
+
+  def serialized_field(form_builder, object, type, method, options = {})
+    field_name = serialized_field_name(method)
+    raw(
+      form_builder.label(field_name, t(method, :scope => [:helpers, :label, form_builder.object_name])) +
+      tag(:br) +
+      case type
+      when :check_box
+        form_builder.send(type, field_name, options.merge(:checked => (object[method] == '1')))
+      else
+        form_builder.send(type, field_name, options.merge(:value => (object[method] || '')))
+      end
+    )
+  end
+
+  def serialized_field_name(*fields)
+    fields.map(&:to_s) * ']['
+  end
 end

data/app/models/administrator.rb

@@ -9,8 +9,6 @@ class Administrator < Person
     :foreign_key => 'element_id',
     :association_foreign_key => 'category_id'
 
-  before_create :activate
-
   def access_path?(controller,action)
     rights.find_by_controller_name_and_action_name(controller,action)
   end

data/app/models/attachment.rb

@@ -14,18 +14,12 @@ class Attachment < ActiveRecord::Base
       :include => :attachment_links,
       :conditions => {
         :attachment_links => {
-        :element_type => element_type.to_s.classify
-      }
+          :element_type => element_type.to_s.classify
+        }
       }
     }
   }
 
-  define_index do
-    indexes filename, :sortable => true
-    indexes content_type, :sortable => true
-    indexes size, :sortable => true
-  end
-
   def file_type
     content_type.split('/').last
   end
@@ -36,9 +30,13 @@ class Attachment < ActiveRecord::Base
     end
   end
 
-  private
-
   def self.options_for(target = class_name)
     (Setting.current.attachments[target] || {}).symbolize_keys
   end
+
+  define_index do
+    indexes filename, :sortable => true
+    indexes content_type, :sortable => true
+    indexes size, :sortable => true
+  end
 end

data/app/models/category.rb

@@ -5,7 +5,7 @@ class Category < ActiveRecord::Base
   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
+    record.errors.add(attr, 'Can\'t be his self parent') if not value.nil? and record.id == value
   end
 
   def level
@@ -34,11 +34,13 @@ class Category < ActiveRecord::Base
 
   def to_jstree
     hash = {}
-    hash[:attr] = { :id => "#{self.class.to_s.underscore}_#{id}", :type => 'folder' }
-    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
+    hash[:attr] = { :id => "#{self.class.to_s.underscore}_#{id}"}
+    hash[:data] = { :title => name, :icon => category_picture }
+    hash[:metadata] = { :id => id }
+    hash[:state] = children.empty? ? 'open' : 'closed'
+    #unless children.empty?
+    # hash[:children] = children.all(:order => 'position ASC').collect(&:to_jstree)
+    #end
     hash
   end
 

data/app/models/person.rb

@@ -1,15 +1,10 @@
 class Person < ActiveRecord::Base
   acts_as_authentic do |c|
-    c.login_field :email
     c.merge_validates_uniqueness_of_email_field_options( :if => :skip_uniquess_of_email? )
     c.crypto_provider = Authlogic::CryptoProviders::BCrypt
   end
   acts_as_tagger
 
-  def self.find_by_login_or_email(login)
-   find_by_email(login)
-  end
-
   has_and_belongs_to_many_attachments
   has_one :avatar,
     :dependent => :destroy

data/app/models/person_session.rb

@@ -1,3 +1,2 @@
 class PersonSession < Authlogic::Session::Base
-  find_by_login_method :find_by_login_or_email
 end

data/app/models/setting.rb

@@ -1,25 +1,19 @@
 require 'ostruct'
 class Setting < ActiveRecord::Base
   belongs_to :address, :dependent => :destroy
-  serialize :mailer, OpenStruct
-  serialize :smtp_settings, OpenStruct
-  serialize :sendmail_settings, OpenStruct
+  serialize :mailer
+  serialize :smtp_settings
+  serialize :sendmail_settings
   serialize :attachments
   accepts_nested_attributes_for :address
 
-  def mailer=(mailer)
-    write_attribute(:mailer, OpenStruct.new(mailer))
-  end
-
-  def smtp_settings=(smtp_settings)
-    write_attribute(:smtp_settings, OpenStruct.new(smtp_settings))
+  def self.current
+    first
   end
 
-  def sendmail_settings=(sendmail_settings)
-    write_attribute(:sendmail_settings, OpenStruct.new(sendmail_settings))
+  def smtp_settings
+    settings = super || {}
+    settings.update(:enable_starttls_auto => (settings[:enable_starttls_auto] == '1'))
   end
 
-  def self.current
-    first
-  end
 end

data/app/models/user_notifier.rb

@@ -1,10 +1,20 @@
 class UserNotifier < ActionMailer::Base
   def reset_password(user, password)
-    content_type "text/html; charset=utf-8"
+    @user = user
+    @password = password
+    mail(
+      :from => 'contact@forgeos.com',
+      :to => "#{user.firstname} #{user.lastname} <#{user.email}>",
+      :subject => I18n.t('admin.reset_password_mail')
+    )
+  end
 
-    recipients "#{user.firstname} #{user.lastname} <#{user.email}>"
-    from       "contact@forgeos.com"
-    subject    "#{I18n.t('admin.reset_password_mail')}"
-    body       :user => user, :password => password
+  def import_finished(email, results)
+    @results = results
+    mail(
+      :from => 'contact@forgeos.com',
+      :to => email,
+      :subject => I18n.t('admin.import.finished')
+    )
   end
-end
+end

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

@@ -7,18 +7,17 @@
 #content.grid_16.alpha.omega
   .grid_12.alpha
     #customer-see.inner-content
-      .padding-wrap
-        .fieldset
-          %h3= t(:infos, :scope => [:back_office, :account]).capitalize
-          .main-infos
-            .main-infos-cutomer
-              %h4{:class => 'small-icons'}= "#{t(:avatar).capitalize} :"
-              %div
-                - if @user.avatar && !@user.avatar.filename.nil?
-                  = image_tag(@user.avatar.public_filename(:thumb))
-            .main-info-separation.big-separation
-            .order-billing-adress
-              %h4{:class => 'small-icons'}= "#{t('email').capitalize} :"
-              %div
-                =h @user.email
-          .clear
+      .fieldset
+        %h3= t(:infos, :scope => [:back_office, :account]).capitalize
+        .main-infos
+          .main-infos-cutomer
+            %h4{:class => 'small-icons'}= "#{t(:avatar).capitalize} :"
+            %div
+              - if @user.avatar && !@user.avatar.filename.nil?
+                = image_tag(@user.avatar.public_filename(:thumb))
+          .order-billing-adress
+            %h4{:class => 'small-icons'}= "#{t('email').capitalize} :"
+            %div
+              =h @user.email
+        .clear
+

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

@@ -1,4 +1,4 @@
-= form_for [forgeos_core, :admin, admin], :html => { :multipart=>true } do |f|
+= form_for [forgeos_core, :admin, admin], :html => { :id => 'wrap', "data-object_name" => admin.class.model_name.singular, :multipart=>true } do |f|
   .backgrounds.big-header
     = f.select :civility, t('civility.select'), { :prompt => t(:please_select) }
     = f.text_field :firstname, :title => t('firstname'), :class => 'defaultValue field_name firstname'

data/app/views/admin/administrators/activate.js.erb

@@ -1 +1 @@
-toggleActivate('#show_admin_<%= @admin.id -%>');
+toggleActivate('#<%= polymorphic_html_id @admin, 'show' -%>');

data/app/views/admin/administrators/destroy.js.erb

@@ -1 +1 @@
-removedataTablesRow('#destroy_admin_<%= @admin.id -%>');
+removedataTablesRow('#<%= polymorphic_html_id @admin, 'destroy' -%>');

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

@@ -4,12 +4,11 @@
     :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'
       [
         content_tag(:div,
           content_tag(:div, '', :class => 'handler') +
-          content_tag(:div, " ".html_safe, :id => link_id, :class => 'small-icons admin-ico'),
+          content_tag(:div, " ".html_safe, :id => polymorphic_html_id(admin), :class => 'small-icons admin-ico'),
           :class => 'handler_container'),
         content_tag(:div, link_to("#{admin.firstname} #{admin.lastname}", [forgeos_core, :edit, :admin, admin]), :class => 'admin-name'),
         admin.role.name,
@@ -18,7 +17,7 @@
           :remote => true,
           :method => :post,
           :class => "small-icons #{klass}",
-          :id => "show_#{link_id}"
+          :id => polymorphic_html_id(admin, 'show')
         ),
         link_to('', '#', :class => 'small-icons duplicate-link') +
         link_to('', [forgeos_core, :edit, :admin, admin], :class => 'small-icons edit-link') +
@@ -27,7 +26,7 @@
           :method => :delete,
           :confirm => I18n.t('admin.destroy.confirm').capitalize,
           :class => 'small-icons destroy-link',
-          :id => "destroy_#{link_id}"
+          :id => polymorphic_html_id(admin, 'destroy')
         )
       ]
   end

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

@@ -1,5 +1,5 @@
 = render :partial => 'tabs'
-= form_for [forgeos_core, :admin, media], :html => { :multipart => true, :id => 'wrap'} do |f|
+= form_for [forgeos_core, :admin, media], :html => { :multipart => true, :id => 'wrap', "data-object_name" => media.class.model_name.singular } do |f|
   .backgrounds.big-header
     = f.text_field :name, :id => 'media-title', :class => 'field_name'
     .interact-links
@@ -89,7 +89,7 @@
           Associated to collection
         #association-media-tree.inner-step
           %ul
-            = hidden_field_tag "#{f.object_name}[attachment_category_ids][]"
-            = render :partial => 'admin/categories/associated_elements', :locals => { :association_id => 'attachment_category_ids', :element => media, :category_ids => media.attachment_category_ids, :categories => find_categories_from_content_type(media) }
+            = hidden_field_tag "#{f.object_name}[category_ids][]"
+            = render :partial => 'admin/categories/associated_elements', :locals => { :association_id => 'category_ids', :element => media, :category_ids => media.category_ids, :categories => find_categories_from_content_type(media) }
             .clear
     .clear

data/app/views/admin/attachments/destroy.js.erb

@@ -1 +1 @@
-removedataTablesRow('#destroy_attachment_<%= @media.id -%>');
+removedataTablesRow('#<%= polymorphic_html_id @media, 'destroy' -%>');

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

@@ -4,12 +4,11 @@
     :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), content_tag(:div, '', :class=>"handler") + content_tag(:div, '', :class=>"small-icons #{@file_type}"), :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 => polymorphic_html_id(media), :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) <<
@@ -21,7 +20,7 @@
           :method => :delete,
           :confirm => I18n.t('media.destroy.confirm').capitalize,
           :class => 'small-icons destroy-link',
-          :id => "destroy_#{link_id}"
+          :id => polymorphic_html_id(media, 'destroy')
         )
       end
       media_array << media.public_filename << media.id << media.filename

data/app/views/admin/base/_attachments_popups.html.haml

@@ -0,0 +1,48 @@
+#imageUploadDialog.upload-lightbox-container.white
+  #imageUpload
+  %span= I18n.t('or')
+  = link_to_function I18n.t('media.add_form_library'), "$('#imageSelectDialog').dialog('open');"
+
+#imageSelectDialog.media-hoverlay
+  .media-hoverlay-header
+    = link_to_function content_tag(:span, I18n.t('media.picture.upload.action').capitalize, :class=>'big-icons add-picture'), "$(\'#imageUploadDialog\').dialog(\'open\'); $(\'#imageSelectDialog\').dialog(\'close\')", :class=>'backgrounds button'
+    .display-mode
+      .heading-separator
+      .display-thumbnails
+      .display-list.off
+    #search.right.image= fg_search
+    .backgrounds.search-form-image
+    .backgrounds.search-form-thumbnails
+  .media-hoverlay-sidebar.grid_3.omega.alpha
+    .sidebar-content
+      %h2{ :class => 'small-icons picture'}
+        = link_to_function I18n.t('media.picture.all').capitalize, "select_all_elements_without_category('picture-attachment-tree')"
+      #picture-attachment-tree
+  .media-hoverlay-content.thumbnails
+    #thumbnail-table.table.datatable.media.selectable_rows
+  .media-hoverlay-content.table.hidden
+    %table#image-table.datatable.media.selectable_rows
+      %tr
+        %td
+
+= dataSlides_tag :id => 'thumbnail-table', :url => forgeos_core.admin_attachments_path(:format => :json, :skin => 'thumbnail', :file_type => 'picture', :mode => 'selection'), :columns => [ '{ "bSortable": true, "bSearchable": true, "sType": "string", "bUseRendered": true, "fnRender": null, "iDataSort": 0, "nTf": null, "nTh": function(){$(".thead").find(".th");}, "sWidth": "0px"}','{"bVisible": false}', '{ "bVisible": false }', '{ "bVisible": false}' ], :autostart => false
+
+= dataTables_tag :id => 'image-table', :url => forgeos_core.admin_attachments_path(:format => :json, :file_type => 'picture', :mode => 'selection'), :columns => ["{'sClass':'th-checkbox-container', 'bSortable': false }","{ 'sTitle': '#{I18n.t('media.filename')}'}","{ 'sTitle': '#{I18n.t('media.content_type')}'}","{ 'sTitle': '#{I18n.t('media.updated_at')}'}","{ 'sTitle': '#{I18n.t('media.size')}'}", '{"bVisible": false}', '{ "bVisible": false }','{ "bVisible": false}','{ "bVisible": false}','{ "bVisible": false}'], :autostart => false
+
+#fileUploadDialog.upload-lightbox-container.white
+  #fileUpload
+
+#fileSelectDialog.media-hoverlay
+  #inner-lightbox.backgrounds
+    - %w(pdf audio video doc media).each do |file_type|
+      = link_to_function I18n.t(:other, :scope => [:media,file_type]), "update_current_dataTable_source('#table-files','#{escape_javascript(forgeos_core.admin_attachments_path(:mode => 'selection',:format => :json, :file_type => file_type))}')", :class => "small-icons #{file_type}"
+  .media-hoverlay-header
+    = link_to_function content_tag(:span, I18n.t('media.upload.action').capitalize, :class=>'big-icons add-media'), "$(\'#fileUploadDialog\').dialog(\'open\'); $(\'#fileSelectDialog\').dialog(\'close\')", :class=>'backgrounds button'
+    #search.right.files= fg_search
+    .backgrounds.search-form-files
+  .media-hoverlay-content
+    %table#table-files.datatable.media.selectable_rows
+      %tr
+        %td
+
+= dataTables_tag :id => 'table-files', :url => forgeos_core.admin_attachments_path(:format => :json, :file_type => 'pdf', :mode => 'selection'), :columns => ["{'sClass':'th-checkbox-container', 'bSortable': false }","{ 'sTitle': '#{I18n.t('media.filename')}'}","{ 'sTitle': '#{I18n.t('media.content_type')}'}","{ 'sTitle': '#{I18n.t('media.updated_at')}'}","{ 'sTitle': '#{I18n.t('media.size')}'}", '{"bVisible": false}', '{ "bVisible": false }','{ "bVisible": false}','{ "bVisible": false}','{ "bVisible": false}'], :autostart => false

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

@@ -5,10 +5,7 @@
     .backgrounds.header
       .interact-links
         = f.submit t('caching.delete.one').capitalize, :class => 'backgrounds interact-button'
+        .left= t('or')
         = f.submit t('caching.delete.all').capitalize, :class => 'backgrounds interact-button'
     .files
-      - @files.each_with_index do |file, index|
-        = check_box_tag "file[#{index}]", file[1]
-        = file[0]
-        = hidden_field_tag "hidden_files[#{index}]", file[1]
-        .clear
+      #caching-tree

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

@@ -0,0 +1,25 @@
+<%-
+  output = @files.map do |file|
+    is_file = !File.directory?(file)
+    file_label = if file == Rails.cache.cache_path
+      t('caching.tmp_directory')
+    elsif file == Rails.configuration.action_controller.page_cache_directory
+      t('caching.public_directory')
+    else
+      file.gsub(/(\/|.)+\//,'')
+    end
+
+    data = {
+      :data => {
+        :title => file_label,
+        :icon => (is_file ? 'file' : 'folder')
+      },
+      :metadata => { :name => file }
+    }
+
+    data[:state] = 'closed' unless is_file
+
+    data
+  end
+-%>
+<%= raw output.to_json -%>

data/app/views/admin/categories/_list.html.haml

@@ -3,7 +3,7 @@
 - categories.each do |category|
   - li_id = "category_#{category.id}"
   %li{ :rel => category.children.empty? ? 'file' : 'folder', :id => li_id }
-    - link_to '#', :id => "link_#{li_id}", :class => 'big-icons' do
+    = link_to '#', :id => "link_#{li_id}", :class => 'big-icons' do
       = category.name
       %span{ :id => "span_#{li_id}"}= category.total_elements_count
 

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

@@ -4,12 +4,11 @@
     :iTotalRecords => @categories.total_entries || 0,
     :iTotalDisplayRecords => @categories.size,
     :aaData => @categories.collect do |category|
-      link_id = "menu_link_#{category.id}"
       [
-        content_tag(:div, tag(:div, :class=>'handler') + tag(:div, :class=>'small-icons category'), :id => link_id, :class => 'handler_container'),
+        content_tag(:div, tag(:div, :class=>'handler') + tag(:div, :class=>'small-icons category'), :id => polymorphic_html_id(category), :class => 'handler_container'),
         content_tag(:div, category.name, :class => 'category-name'),
         category.id,
-        link_to(category.name, '#')#[forgeos_core, :admin, category])
+        link_to(category.name, [forgeos_core, :admin, category])
       ]
     end
   }

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

@@ -1,4 +1,4 @@
-- form_tag nil, :id => 'map_fields_form', :method => :post do
+= form_tag request.url, :id => 'map_fields_form', :method => :post do
   .backgrounds.big-header
     = text_field_tag :set_name,(@set ? @set.name : ''), :class => 'field_name'
     = hidden_field_tag :set_id, @set.id if @set

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

@@ -7,18 +7,15 @@
   #content.grid_16.alpha.omega
     .grid_12.alpha
       .inner-content
-        - if @sets = ImportSet.all
-          - unless @sets.empty?
-            = label_tag :set_id, t(:import_set, :count => 1)
-            %div= select_tag :set_id, options_from_collection_for_select([ImportSet.new(:name => 'Please select')]+@sets, :id, :name)
-            .clear
+        - if ImportSet.count > 0
+          = label_tag :set_id, t(:import_set, :count => 1)
+          = select_tag :set_id, options_from_collection_for_select([ImportSet.new(:name => 'Please select')]+ ImportSet.all, :id, :name)
+          %br
         = label :import, :model, t('import.model')
-        %div
-          = select :import, :model, options_for_select(@models.sort.map{|model| [t(model,:count => 2),model] }), { :prompt => true }, :onchange => "jQuery('#import_form').attr('action', 'import/create_'+this.value)"
-        .clear
+        = select :import, :model, options_for_select(@models.sort.map{|model| [t(model,:count => 2),model] }), { :prompt => true }
+        %br
         = label_tag :file, t('import.file')
-        %div
-          = file_field_tag :file
+        = file_field_tag :file
     #right-sidebar.grid_4.omega
       .step
         = label :parser_options, :col_sep, t('import_set.col_sep')
@@ -26,4 +23,3 @@
         %br
         = label :parser_options, :quote_char, t('import_set.quote_char')
         = text_field :parser_options, :quote_char, :value => '"', :size => 2
-= javascript_tag "jQuery('#import_form').attr('action', 'import/create_'+jQuery('#import_model').val())"

data/app/views/admin/person_sessions/destroy.html.haml

@@ -9,10 +9,10 @@
     .grid_3.alpha
       \ 
     .buttons.grid_4.alpha.omega
-      - link_to forgeos_core.admin_login_path, :class => 'backgrounds button' do
+      = link_to forgeos_core.admin_login_path, :class => 'backgrounds button' do
         %span.small-icons.admin
           = I18n.t('go_back_admin').capitalize
-      - link_to :root, :class => 'backgrounds button' do
+      = link_to :root, :class => 'backgrounds button' do
         %span.small-icons.see
           = I18n.t('see_site').capitalize
     .grid_3.omega

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

@@ -1,4 +1,4 @@
-= form_for [forgeos_core, :admin, right] do |f|
+= form_for [forgeos_core, :admin, right], :html => { :id => 'wrap', "data-object_name" => admin.class.model_name.singular } do |f|
   = f.error_messages
   %p
     %b

data/app/views/admin/rights/destroy.js.erb

@@ -1 +1 @@
-removedataTablesRow('#destroy_right_<%= @right.id -%>');
+removedataTablesRow('#<%= polymorphic_html_id @right, 'destroy' -%>');

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

@@ -4,11 +4,10 @@
     :iTotalRecords => @rights.total_entries || 0,
     :iTotalDisplayRecords => @rights.size,
     :aaData => @rights.collect do |right|
-      link_id = "right_#{right.id}"
       [
         content_tag(:div,
           content_tag(:div, '', :class => 'handler') +
-          content_tag(:div, '', :id => link_id, :class => 'small-icons right-ico'),
+          content_tag(:div, '', :id => polymorphic_html_id(right), :class => 'small-icons right-ico'),
           :class => 'handler_container'),
         content_tag(:div, right.name, :class => 'right-name'),
         right.controller_name,
@@ -20,7 +19,7 @@
           :method => :delete,
           :confirm => I18n.t('right.destroy.confirm').capitalize,
           :class => 'small-icons destroy-link',
-          :id => "destroy_#{link_id}"
+          :id => polymorphic_html_id(right, 'destroy')
         )
       ]
     end

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

@@ -1,5 +1,5 @@
 = render :partial => 'tabs'
-= form_for [forgeos_core, :admin, role],  :html => { :id => 'wrap' } do |f|
+= form_for [forgeos_core, :admin, role],  :html => { :id => 'wrap', "data-object_name" => role.class.model_name.singular } do |f|
   = hidden_field_tag "role[right_ids][]"
 
   .backgrounds.big-header
@@ -10,7 +10,7 @@
   #content.grid_16.alpha.omega
     .grid_12.alpha
       .padding-wrap
-        - right_categories = RightCategory.order('name').joins(:translations)
+        - right_categories = RightCategory.order('name').joins(:translations).all
         - right_categories.each do |right_category|
           .fieldset
             %a.small-icons.panel{ :href => '#' }
@@ -28,7 +28,7 @@
                   %label= right.name
               .clear
 
-      - rights = Right.where(:conditions => { :categories => {:id => nil} }).includes(:right_categories)
+      - rights = Right.where(:conditions => { :categories_elements => {:category_id => nil} }).includes(:categories).all
       - unless rights.nil?
         .fieldset
           %a.small-icons.panel{ :href => '#' }

data/app/views/admin/roles/activate.js.erb

@@ -1 +1 @@
-toggleActivate('#show_role_<%= @role.id -%>');
+toggleActivate('#<%= polymorphic_html_id @role, 'show' -%>');

data/app/views/admin/roles/destroy.js.erb

@@ -1 +1 @@
-removedataTablesRow('#destroy_role_<%= @role.id -%>');
+removedataTablesRow('#<%= polymorphic_html_id @role, 'destroy' -%>');

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

@@ -4,10 +4,9 @@
     :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>'.html_safe, :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 => polymorphic_html_id(role), :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 />').html_safe, :style=>'display:none'),
         role.administrators.count,
@@ -16,7 +15,7 @@
           :remote => true,
           :method => :post,
           :class => "small-icons #{klass}",
-          :id => "show_#{link_id}"
+          :id => polymorphic_html_id(role, 'show')
         ),
         #link_to('', [:duplicate, :admin, role], :class => 'small-icons duplicate-link') +
         link_to('', [forgeos_core, :edit, :admin, role], :class => 'small-icons edit-link') +
@@ -25,7 +24,7 @@
           :method => :delete,
           :confirm => I18n.t('role.destroy.confirm').capitalize,
           :class => 'small-icons destroy-link',
-          :id => "destroy_#{link_id}"
+          :id => polymorphic_html_id(role, 'destroy')
         )
       ]
     end

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

@@ -20,7 +20,7 @@
                 %label= right.name
               .clear
 
-      - rights = Right.all(:include => :right_categories, :conditions => { :categories => {:id => nil} })
+      - rights = Right.all(:include => :categories, :conditions => { :categories => {:id => nil} })
       - unless rights.nil?
         .fieldset
           %a.small-icons.panel{ :href => '#' }

data/app/views/admin/settings/_general.html.haml

@@ -1,4 +1,4 @@
-.fieldset.grid_11
+.fieldset.grid_10
   %h2= t 'setting.company_info'
   .clear
   = f.fields_for :address do |address|
@@ -16,11 +16,11 @@
       = address.text_field :city
     .country-select
       = address.label :country_id, t('address.country').capitalize
-      = address.collection_select :country_id, Country.all(:order => "name"), :id, :printable_name, :prompt => t(:please_select)
+      = address.collection_select :country_id, Country.all, :id, :printable_name, :prompt => t(:please_select)
     .clear
 .tool-tip-settings.grid_4
   The shop localization reassure your customers.
-.fieldset.grid_11
+.fieldset.grid_10
   %h2= t 'setting.contact_info'
   .clear
   .phone-input
@@ -35,3 +35,4 @@
   .clear
 .tool-tip-settings.grid_4
   The shop localization reassure your customers.
+