From 358d87c74781ff68e8a5facaeaf2cccc455ce425 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Mon, 11 May 2009 19:34:07 -0300 Subject: [PATCH] ActionItem937: being more flexible when selecting folders --- app/controllers/admin/admin_panel_controller.rb | 2 +- app/models/environment.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/admin_panel_controller.rb b/app/controllers/admin/admin_panel_controller.rb index 2419cee..1670512 100644 --- a/app/controllers/admin/admin_panel_controller.rb +++ b/app/controllers/admin/admin_panel_controller.rb @@ -51,7 +51,7 @@ class AdminPanelController < AdminController end def set_portal_folders - @portal_folders = environment.portal_community.articles.find_all_by_type('Folder') + @portal_folders = environment.portal_community.folders if request.post? env = environment folders = params[:folders].map{|fid| Folder.find(:first, :conditions => {:profile_id => env.portal_community, :id => fid})} diff --git a/app/models/environment.rb b/app/models/environment.rb index 4a69f9d..71b8639 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -553,7 +553,7 @@ class Environment < ActiveRecord::Base end def portal_folders - (settings[:portal_folders] || []).map{|fid| Folder.find(:first, :conditions => {:profile_id => portal_community.id, :id => fid})} + (settings[:portal_folders] || []).map{|fid| portal_community.articles.find(fid) } end def portal_folders=(folders) -- libgit2 0.21.2