fonction dossier thématique vs prestations

app/models/folder.rb

@@ -14,8 +14,10 @@ class Folder < ActiveRecord::Base
 	has_many :articles
 	
 	validates :title, :presence => true
+	validates :folder_type_id, :presence => true
 	validates :slug, :presence => true, :uniqueness => true
 	
+	FOLDER_TYPES = [["Dossier thématique",1], ["Prestation",2]]
 	
 	
 	def cible_url

app/models/portlets/dynamic_content.rb

@@ -4,6 +4,6 @@ class DynamicContent < ActiveRecord::Base
   
   belongs_to :item
  
-  NAMES = {"formulaire_ordonnances" => "Formulaire dépôt ordonnances", "folder_list" => "Liste des dossiers", "promotions-list" => "Liste des promotions"}
+  NAMES = {"formulaire_ordonnances" => "Formulaire dépôt ordonnances", "folder_list" => "Liste des dossiers thématiques", "promotions-list" => "Liste des promotions", "folder_list_prestation" => "Liste des prestations"}
  
 end

app/views/admin/folders/_form.html.haml

@@ -1,6 +1,7 @@
 = semantic_form_for [:admin,@folder], :remote => true do |form| 
 	.content
 		= form.inputs do 
+			= form.input :folder_type_id, :collection => Folder::FOLDER_TYPES, :label => "Type :", :as => :select
 			= form.input :enabled,:as => :boolean , :label => "Actif" 
 			= form.input :title, :label => "Titre :" 
 			= form.input :slug, :label => "Slug :" 

app/views/admin/folders/_show.html.haml

@@ -6,6 +6,11 @@
 				=image_tag @folder.image_file.file.large.medium.small.thumb.url if @folder.image_file
 			%td{:style => "width:150px;"}  Nom : 
 			%td=@folder.title
+		%tr
+			%td Type de dossier :
+			%td
+				=Folder::FOLDER_TYPES[@folder.folder_type_id.to_i-1][0] if @folder.folder_type_id
+				=@folder.folder_type_id
 		%tr
 			%td Permalink :
 			%td=@folder.slug

app/views/admin/promotions/show.html.haml

@@ -1,2 +0,0 @@
-%h1 Admin::Promotions#show
-%p Find me in app/views/admin/promotions/show.html.haml

app/views/portlets/dynamic_contents/_folder_list.html.haml

@@ -1 +1 @@
-=render(:partial => "public/folders/folder",:collection => Folder.where(:enabled => true).order(:title))
+=render(:partial => "public/folders/folder",:collection => Folder.where(:enabled => true, :folder_type_id => 1).order(:title))

app/views/portlets/dynamic_contents/_folder_list_prestation.html.haml

@@ -0,0 +1 @@
+=render(:partial => "public/folders/folder",:collection => Folder.where(:enabled => true, :folder_type_id => 2).order(:title))

app/views/public/articles/show.html.haml

@@ -6,7 +6,7 @@
 		#menu_left
 			%h3= link_to "Dossiers", "/pages/dossiers.html"
 			%ul
-				-Folder.where(:enabled => true).order(:title).each do |folder|
+				-Folder.where(:enabled => true, :folder_type_id => @folder.folder_type_id).order(:title).each do |folder|
 					%li
 						=link_to folder.title, folder_path(:slug => folder.slug)
 						-if folder == @folder
@@ -17,7 +17,10 @@
 		#breadcrumb
 			=link_to "Accueil", "/"
 			>
+			-if @folder.folder_type_id == 1
 				=link_to "Dossiers", "/pages/dossiers.html"
+			-else
+				=link_to "Nos prestations", "/pages/nos-prestations.html"
 			>
 			=link_to @folder.title, folder_path(:slug => @folder.slug)
 			>

app/views/public/folders/show.html.haml

@@ -6,13 +6,16 @@
 		#menu_left
 			%h3= link_to "Dossiers", "/pages/dossiers.html"
 			%ul
-				-Folder.where(:enabled => true).order(:title).each do |folder|
+				-Folder.where(:enabled => true, :folder_type_id => @folder.folder_type_id).order(:title).each do |folder|
 					%li=link_to folder.title, folder_path(:slug => folder.slug)
 	#content
 		#breadcrumb
 			=link_to "Accueil", "/"
 			>
+			-if @folder.folder_type_id == 1
 				=link_to "Dossiers", "/pages/dossiers.html"
+			-else
+				=link_to "Nos prestations", "/pages/nos-prestations.html"
 			>
 			=@folder.title
 		=render @folder.block

db/migrate/20110822091539_add_folder_type_to_folders.rb

@@ -0,0 +1,5 @@
+class AddFolderTypeToFolders < ActiveRecord::Migration
+  def change
+    add_column :folders, :folder_type_id, :integer
+  end
+end

db/migrate/20110822092003_set_folder_default.rb

@@ -0,0 +1,12 @@
+class SetFolderDefault < ActiveRecord::Migration
+  def up
+	Folder.all.each do |f|
+		f.folder_type_id = 1
+		f.save
+	end
+	
+  end
+
+  def down
+  end
+end