Merge commit 'core/user-segment' into development

Conflicts: vendor/modules/blog/app/controllers/blog/manage_controller.rb
cykod · Jun 28, 2010 · f72336c · f72336c
2 parents c36e915 + 97b6275
commit f72336c
Show file tree

Hide file tree

Showing 89 changed files with 6,701 additions and 735 deletions.
diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb
@@ -25,7 +25,13 @@ class ContentController < ModuleController #:nodoc: all
   register_handler :content, :feature, "Content::CoreFeature::KeywordGenerator"
 
   register_handler :trigger, :actions, "Trigger::CoreTrigger"
-
+
+  register_handler :user_segment, :fields, 'EndUserSegmentField'
+  register_handler :user_segment, :fields, 'EndUserActionSegmentField'
+  register_handler :user_segment, :fields, 'EndUserCacheSegmentField'
+  register_handler :user_segment, :fields, 'EndUserTagSegmentField'
+  register_handler :user_segment, :fields, 'UserSubscriptionEntrySegmentField'
+
   def index
     @content_models,@content_actions = CmsController.get_content_models_and_actions
 

diff --git a/app/controllers/member_export_controller.rb b/app/controllers/member_export_controller.rb
@@ -3,12 +3,12 @@
 class MemberExportController < CmsController # :nodoc: all
   layout 'manage'
   permit 'editor_members'
-  
-  def index
-    cms_page_info([ [ 'E-marketing', url_for(:controller => 'emarketing') ], 
-                    [ 'Email Targets', url_for(:controller =>'members', :refresh => 1 ) ],
-                    'Member Download' ], 'e_marketing' )
-
+
+  cms_admin_paths "people",
+                  "People" => { :controller => '/members' },
+                  "User Lists" => { :controller => '/members', :action => 'segments' }
+
+  def index    
     @export = DefaultsHashObject.new(:download => 'all')
 
     @include_options = [ [ 'Home Address','home' ], 
@@ -18,23 +18,21 @@ def index
                          ['Tags','tags']
                        ]
 
-    @segment= session[:et]
-    session[:members_table_segment] ||= {} 
+    @segment = UserSegment.find_by_id params[:path][0]
 
-    current_segment = MarketSegment.new(:segment_type => 'members',:options => session[:members_table_segment])
+    cms_page_path ["People", [@segment ? @segment.name : 'Everyone'.t, url_for(:controller => 'members', :action => 'index', :path => @segment ? @segment.id : nil)]], 'Export Users'
 
-     @member_count = current_segment.target_count
-
+    @member_count = @segment ? @segment.last_count : EndUser.count(:conditions => {:client_user_id => nil})
   end
 
   def generate_file
-     session[:members_table_segment] ||= {} 
-
-
-     worker_key = MemberExportWorker.async_do_work( :domain_id => DomainModel.active_domain_id,
+    @segment = UserSegment.find_by_id params[:path][0]
+
+    worker_key = MemberExportWorker.async_do_work( :domain_id => DomainModel.active_domain_id,
                                       :export_options => (params[:export] || {})[:include],
-                                      :export_segmentation => session[:members_table_segment]
-                                      )        
+                                      :user_segment_id => @segment ? @segment.id : nil
+                                      )
+
     session[:member_download_worker_key] = worker_key
 
     render :nothing => true