svn commit: r1627220 - in /perl/embperl/trunk/Embperl/Form: Control/mult.pm ControlMultValue.pm

[ri...@apache.org]

Author: richter
Date: Wed Sep 24 05:21:50 2014
New Revision: 1627220

URL: http://svn.apache.org/r1627220
Log:
Fixes for sortvalue & mult control

Modified:
    perl/embperl/trunk/Embperl/Form/Control/mult.pm
    perl/embperl/trunk/Embperl/Form/ControlMultValue.pm

Modified: perl/embperl/trunk/Embperl/Form/Control/mult.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/mult.pm?rev=1627220&r1=1627219&r2=1627220&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/mult.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/mult.pm Wed Sep 24 05:21:50 2014
@@ -142,6 +142,41 @@ sub get_display_text
     return $field -> get_display_text ($req, $value) ;
     }
 
+# ---------------------------------------------------------------------------
+#
+#   get_option_form_value - returns the option for a given value
+#
+#   in  $value  value
+#   ret         option
+#
+
+sub get_option_from_value
+
+    {
+    my ($self, $value, $req) = @_ ;
+
+    my $field = $self -> {fields}[0] ;
+    return if (!$field) ;
+    
+    return $field -> get_option_from_value ($value, $req) ;
+    }
+    
+# ---------------------------------------------------------------------------
+#
+#   get_id_from_value - returns id for a given value
+#
+
+sub get_id_from_value
+
+    {
+    my ($self, $value, $req) = @_ ;
+
+    my $field = $self -> {fields}[0] ;
+    return if (!$field) ;
+    
+    return $field -> get_id_from_value ($value, $req) ;
+    }
+    
 # ------------------------------------------------------------------------------------------
 
 sub show 

Modified: perl/embperl/trunk/Embperl/Form/ControlMultValue.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/ControlMultValue.pm?rev=1627220&r1=1627219&r2=1627220&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/ControlMultValue.pm (original)
+++ perl/embperl/trunk/Embperl/Form/ControlMultValue.pm Wed Sep 24 05:21:50 2014
@@ -203,6 +203,19 @@ sub get_id_from_value
     my ($self, $value, $req) = @_ ;
 
     return if (!$self -> {datasrcobj}) ;
+    
+    if (wantarray)
+        {
+        $value = [$value] if (!ref $value) ;
+        my @result ;    
+        foreach my $val (@$value)
+            {
+            push @result, $self -> {datasrcobj} -> get_id_from_value ($val, $req) ;    
+            }
+        return @result ;    
+        }
+        
+    $value = $value -> [0] if (ref $value) ;
     return $self -> {datasrcobj} -> get_id_from_value ($value, $req) ;
     }
 
@@ -338,6 +351,24 @@ sub get_display_text
     return join (', ', @result) ;
     }
     
+# ------------------------------------------------------------------------------------------
+#
+#   get_sort_value - returns the value that should be used to sort
+#
+
+sub get_sort_value
+    {
+    my ($self, $req, $value) = @_ ;
+    
+    if ($self -> {datasrcobj} && $self -> {datasrcobj} -> can('get_sort_value'))
+        {
+        $value = $self -> get_value ($req) if (!defined ($value)) ;
+        return $self -> {datasrcobj} -> get_sort_value ($req, $value) ;     
+        }
+
+    return $self -> SUPER::get_sort_value ($req, $value) ;
+    }
+    
 # ---------------------------------------------------------------------------
 #
 #   init_markup - add any dynamic markup to the form data



---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org