[Phpgroupware-cvs] CVS: etemplate/inc class.nextmatch_widget.inc.php,1.5,1.6 class.uietemplate.inc.php,1.19,1.20

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/etemplate/inc
In directory subversions:/tmp/cvs-serv15735

Modified Files:
        class.nextmatch_widget.inc.php class.uietemplate.inc.php 
Log Message:
eTemplate extensions can now change the $readonlys-array.
nextmatch-widget uses this to allow get_rows to switch button on and off.

Index: class.nextmatch_widget.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.nextmatch_widget.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.nextmatch_widget.inc.php      24 Sep 2002 12:44:03 -0000      1.5
--- class.nextmatch_widget.inc.php      24 Sep 2002 17:26:04 -0000      1.6
***************
*** 32,51 ****
                }
  
!               function pre_process(&$cell,&$value,&$templ,$do_get_rows=True)
                {
                        //echo "<p>nextmatch_widget.pre_process: value = "; 
_debug_array($value);
!                       // save selected tab in persistent extension_data to 
use it in post_process
                        
$GLOBALS['phpgw_info']['etemplate']['extension_data']['nextmatch_widget'][$cell['name']]
 = $value;
  
!                       if ($do_get_rows)
                        {
!                               $value['rows'] = 
ExecMethod($value['get_rows'],$value);
!                               if ($value['start'] > $value['rows'][0])
!                               {
!                                       $value['start'] = 0;
!                                       $value['rows'] = 
ExecMethod($value['get_rows'],$value);
!                               }
!                               
$GLOBALS['phpgw_info']['etemplate']['extension_data']['nextmatch_widget'][$cell['name']]['total']
 = $value['rows'][0];
                        }
                        if ($cell['size'])
                        {
--- 32,51 ----
                }
  
!               function pre_process(&$cell,&$value,&$templ,&$readonlys)
                {
                        //echo "<p>nextmatch_widget.pre_process: value = "; 
_debug_array($value);
!                       // save values in persistent extension_data to be able 
use it in post_process
                        
$GLOBALS['phpgw_info']['etemplate']['extension_data']['nextmatch_widget'][$cell['name']]
 = $value;
  
!                       list($app,$class,$method) = 
explode('.',$value['get_rows']);
!                       $obj = CreateObject($app.'.'.$class);
!                       $total = $value['total'] = 
$obj->$method($value,$value['rows'],$readonlys['rows']);
!                       if ($value['start'] > $total)
                        {
!                               $value['start'] = 0;
!                               $total = 
$obj->$method($value,$value['rows'],$readonlys['rows']);
                        }
+                       
$GLOBALS['phpgw_info']['etemplate']['extension_data']['nextmatch_widget'][$cell['name']]['total']
 = $total;
+ 
                        if ($cell['size'])
                        {
***************
*** 65,69 ****
                                $nextmatch->disable_cells('filter2');
                        }
-                       $total = $value['rows'][0];
                        $start = $value['start'];
                        $max   = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
--- 65,68 ----
***************
*** 88,93 ****
  
                        $old_value = 
$GLOBALS['phpgw_info']['etemplate']['extension_data']['nextmatch_widget'][$cell['name']];
- 
-                       //$this->pre_process($cell,$value,$templ);
  
                        list($value['cat_id']) = $value['cat_id'];
--- 87,90 ----

Index: class.uietemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.uietemplate.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.uietemplate.inc.php   24 Sep 2002 10:00:58 -0000      1.19
--- class.uietemplate.inc.php   24 Sep 2002 17:26:04 -0000      1.20
***************
*** 365,369 ****
                            (isset($this->extension[$cell['type']]) || 
$this->loadExtension($cell['type'],$this)))
                        {
!                               $extra_label = 
$this->extension[$cell['type']]->pre_process($cell,$value,$this);
                                if (strstr($name,'|'))
                                {
--- 365,369 ----
                            (isset($this->extension[$cell['type']]) || 
$this->loadExtension($cell['type'],$this)))
                        {
!                               $extra_label = 
$this->extension[$cell['type']]->pre_process($cell,$value,$this,$readonlys[$name]);
                                if (strstr($name,'|'))
                                {