Merge commit 'core/add-multi-options-user-segment' into development

app/models/content_model_segment_field.rb

@@ -88,6 +88,11 @@ def self.get_handler_data(ids, fields)
   end
 
   def self.field_output(user, handler_data, field)
-    UserSegment::FieldType.field_output(user, handler_data, field)
+    info = UserSegment::FieldHandler.display_fields[field]
+    return unless info
+    display_field = info[:display_field]
+    handler_data[user.id].collect do |data|
+      self.content_model.field(display_field).content_display(data, :excerpt)
+    end.join(', ')
   end
 end

app/models/user_segment/field_type.rb

@@ -135,14 +135,14 @@ def self.field_output(mdl, handler_data, field)
     display_field = info[:display_field]
 
     value = nil
-    if handler_data.nil?
+    if handler_data.nil? # from end_user
       return nil unless mdl.respond_to?(display_field)
       value = mdl.send(display_field)
     else
       return nil unless handler_data[mdl.id]
 
       data = handler_data[mdl.id]
-      if data.is_a?(Array)
+      if data.is_a?(Array) # group_by
         value = data.collect { |d| d.send(display_field) }.delete_if { |v| v.nil? }
 
         case info[:display_method]
@@ -157,20 +157,21 @@ def self.field_output(mdl, handler_data, field)
         when 'count'
           value = value.size
         end
-
-        if value.is_a?(Array)
-          value = value.collect do |v|
-            v = v.strftime(DEFAULT_DATETIME_FORMAT.t) if v.is_a?(Time)
-            v = v.name if v.is_a?(DomainModel)
-            v
-          end
-          value = value.join(', ')
-        end
-      else
+      else # index_by
         value = data.send(display_field)
       end
     end
 
+    if value.is_a?(Array)
+      value = value.collect do |v|
+        v = v.strftime(DEFAULT_DATETIME_FORMAT.t) if v.is_a?(Time)
+        v = v.name if v.is_a?(DomainModel)
+        v
+      end
+
+      value = value.map(&:to_s).reject(&:blank?).join(', ')
+    end
+
     value = value.strftime(DEFAULT_DATETIME_FORMAT.t) if value.is_a?(Time)
     value = value.name if value.is_a?(DomainModel)
     value = 'Yes'.t if value.is_a?(TrueClass)