diff --git a/app/models/article.rb b/app/models/article.rb index 903f40b..2ad79a8 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -9,7 +9,7 @@ class Article < ActiveRecord::Base after_create :after_creation before_validation do - self.slug = self.slug.to_slug + self.slug = self.title.to_slug self.tags_cache = self.tags_cache.gsub(/ +/, ' ').gsub(/, /,',').gsub(/ ,/,',').gsub(/,+/, ',') end diff --git a/app/models/block.rb b/app/models/block.rb index 1accc54..d5e9717 100644 --- a/app/models/block.rb +++ b/app/models/block.rb @@ -37,7 +37,7 @@ class Block < ActiveRecord::Base end def alloweds_types - allow_types :all #:TitleContent, :ImageContent + allow_types :TitleContent, :TextContent, :ImageContent, :LinkContent, :BreakContent, :GalleryContent, :BlockContent end diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 51a0e9a..3305a50 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -37,7 +37,7 @@ class MenuItem < ActiveRecord::Base end before_validation do - self.slug = self.slug.to_slug + self.slug = self.name.to_slug self.validate_permalink end diff --git a/app/views/admin/articles/_form.html.haml b/app/views/admin/articles/_form.html.haml index db65735..b9c9bff 100644 --- a/app/views/admin/articles/_form.html.haml +++ b/app/views/admin/articles/_form.html.haml @@ -6,7 +6,7 @@ = form.input :published_at, :label => "Date de publication : ",:as => :qi_date_picker = form.input :title, :label => "Titre :" - = form.input :slug, :label => "Slug :" + =# form.input :slug, :label => "Slug :" = form.input :tags_cache, :label => "Tags :" = form.input :description, :label => "Description courte :", :as => :text = form.input :image_file_id, :label => "Image :", :as => :qi_image_select diff --git a/app/views/admin/menu_items/_form.html.haml b/app/views/admin/menu_items/_form.html.haml index b879271..1d477b5 100644 --- a/app/views/admin/menu_items/_form.html.haml +++ b/app/views/admin/menu_items/_form.html.haml @@ -1,7 +1,7 @@ = form.inputs do =form.input :enabled, :label => "Publié ?" = form.input :name, :label => "Nom :" - = form.input :slug, :label => "slug :"# if current_admin.super_admin? || !@menu_item.super_admin + =# form.input :slug, :label => "slug :"# if current_admin.super_admin? || !@menu_item.super_admin = #form.input :super_admin,:as => :boolean , :label => "Super Admin"# if current_admin.super_admin? = form.input :menu_id,:as => :hidden diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml index 6f5c6e6..7c1e9d0 100644 --- a/app/views/layouts/admin.html.haml +++ b/app/views/layouts/admin.html.haml @@ -37,7 +37,7 @@ .collapse.nav-collapse %ul.nav - %li= link_to "admins", admin_admins_path + =#%li= link_to "admins", admin_admins_path %li -Menu.all.each do |menu| = link_to "éléments de menu", admin_menu_items_path(:menu_id => menu.id)