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

[richter]

Author: richter
Date: Tue May 22 07:41:02 2012
New Revision: 1341333

URL: http://svn.apache.org/viewvc?rev=1341333&view=rev
Log:
Sub datasrc names

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=1341333&r1=1341332&r2=1341333&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/mult.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/mult.pm Tue May 22 07:41:02 2012
@@ -155,11 +155,11 @@ $]
     my $span = 0 ;
   -]
   <div [+ do { local $escmode = 0 ; $self -> get_std_control_attr($req) } +]>
-  <input type="hidden" name="__[+ $self -> {name} +]_max" id="__[+ $self -> 
{fullid} +]_max">
-  <table class="ef-control-mult-table" id="[+ $self -> {fullid} +]">
+  <input type="hidden" name="__[+ $self -> {name} +]_max" id="__[+ $self -> 
{fullid} +]_mult_max">
+  <table class="ef-control-mult-table" id="[+ $self -> {fullid} +]_mult">
     [- $self -> show_grid_table ($req) ; -]
   </table>
-  <table id="__[+ $self -> {fullid} +]_newrow" style="display: none">
+  <table id="__[+ $self -> {fullid} +]_mult_newrow" style="display: none">
     [-
     local $req -> {epf_no_script} = 1 ;
     $self -> show_grid_table_row ($req, '%row%') ;
@@ -169,7 +169,7 @@ $]
 
 [$if (! $self -> is_readonly ($req)) $]
  <[$if $noscript $]x-[$endif$]script>
-      $('#[+ $self -> {fullid} +]').eplgrid ([$if $on_grid_change 
$]{'onchange': [+ $on_grid_change +] }[$endif$]) ;
+      $('#[+ $self -> {fullid} +]_mult').eplgrid ([$if $on_grid_change 
$]{'onchange': [+ $on_grid_change +] }[$endif$]) ;
  </[$if $noscript $]x-[$endif$]script>
 [$endif$]  
 [$endif$]  
@@ -193,7 +193,7 @@ $]
     my $ro = $self -> is_readonly ($req) ;
     $]
 
-    <tr class="cGridRow" id="[+ "$id-row-$i" +]">
+    <tr class="cGridRow" id="[+ "${id}_mult-row-$i" +]">
 
             <td class="[+ $self -> {class} +]Cell">
               [-
@@ -221,8 +221,8 @@ $]
  
  $]
 [$if (! $self -> is_readonly ($req)) $]
-              <span class="ui-icon ui-icon-circle-plus ef-icon" id="[+ $self 
-> {fullid} +]-add" title="Zeile Hinzuf&uuml;gen"></span>
-              <span class="ui-icon ui-icon-circle-minus ef-icon"  id="[+ $self 
-> {fullid} +]-del" title="Zeile L&ouml;schen"></span>
+              <span class="ui-icon ui-icon-circle-plus ef-icon" id="[+ $self 
-> {fullid} +]_mult-add" title="Zeile Hinzuf&uuml;gen"></span>
+              <span class="ui-icon ui-icon-circle-minus ef-icon"  id="[+ $self 
-> {fullid} +]_mult-del" title="Zeile L&ouml;schen"></span>
               
 [$endif$]              
 [$endsub$]

Modified: perl/embperl/trunk/Embperl/Form/ControlMultValue.pm
URL: 
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/ControlMultValue.pm?rev=1341333&r1=1341332&r2=1341333&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/ControlMultValue.pm (original)
+++ perl/embperl/trunk/Embperl/Form/ControlMultValue.pm Tue May 22 07:41:02 2012
@@ -36,9 +36,12 @@ sub init
 
     if ($self -> {datasrc})
         {
+        my $name = $self -> {datasrc} ;
+        $name =~ s/#.+$// ;
         my $form = $self -> form ;
         my $packages = $form -> get_datasrc_packages ;
-        $self -> {datasrcobj} = $form -> new_object ($packages, $self -> 
{datasrc}, $self) ;
+        $self -> {datasrcobj} = $form -> new_object ($packages, $name, $self) ;
+        $self -> {datasrcobj}{datasrc} = $self -> {datasrc} ;
         }
 
     $self -> SUPER::init ;
@@ -366,6 +369,8 @@ Name of an class which provides the valu
 values and options parameters. Either a full package name or
 a name, in which case all packages which are returned
 by Embperl::Form::get_datasrc_packages are searched.
+Everything after '#' is ignored and can be used by the
+DataSource module to do further selections.
 
 =head3 no_datasource_controls
 



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