[Phpgroupware-cvs] property/inc/class.uis_agreement.inc.php, 1.2

[nomail]

Update of /property/inc
Modified Files:
        Branch: 
          class.uis_agreement.inc.php

date: 2004/06/11 18:45:50;  author: sigurdne;  state: Exp;  lines: +8 -12

Log Message:
no message
=====================================================================
Index: property/inc/class.uis_agreement.inc.php
diff -u property/inc/class.uis_agreement.inc.php:1.1 
property/inc/class.uis_agreement.inc.php:1.2
--- property/inc/class.uis_agreement.inc.php:1.1        Fri Jun 11 17:13:13 2004
+++ property/inc/class.uis_agreement.inc.php    Fri Jun 11 18:45:50 2004
@@ -161,9 +161,6 @@
                        $list = $this->bo->read();
 
                        $uicols         = $this->bo->uicols;
-//                     $list           = $this->list_content($list,$uicols);
-//                     $content        = $list['content'];
-//                     $table_header=$list['table_header'];
 
                        $j=0;
 
@@ -184,13 +181,13 @@
                                        {
                                                
$content[$j]['row'][$i]['statustext']                   = lang('view the 
entity');
                                                $content[$j]['row'][$i]['text'] 
                                = lang('view');
-                                               
$content[$j]['row'][$i++]['link']                               = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.view&s_agreement_id='
 . $entry['id'] .'&role=' . $this->role);
+                                               
$content[$j]['row'][$i++]['link']                               = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.view&id='
 . $entry['id'] .'&role=' . $this->role);
                                        }
                                        if($this->acl_edit)
                                        {
                                                
$content[$j]['row'][$i]['statustext']                   = lang('edit the 
s_agreement');
                                                $content[$j]['row'][$i]['text'] 
                                = lang('edit');
-                                               
$content[$j]['row'][$i++]['link']                               = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.edit&s_agreement_id='
 . $entry['id'] .'&role=' . $this->role);
+                                               
$content[$j]['row'][$i++]['link']                               = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.edit&id='
 . $entry['id'] .'&role=' . $this->role);
                                        }
                                        if($this->acl_delete)
                                        {
@@ -447,7 +444,7 @@
 
                function edit()
                {
-                       $s_agreement_id = 
get_var('s_agreement_id',array('POST','GET'));
+                       $s_agreement_id = get_var('id',array('POST','GET'));
                        $values         = get_var('values',array('POST'));
                        $delete_item    = get_var('delete_item',array('GET'));
                        $item_id        = get_var('item_id',array('GET'));
@@ -794,7 +791,7 @@
                                                if ($values['save'])
                                                {
                                                        
$GLOBALS['phpgw']->session->appsession('session_data','s_agreement_receipt',$receipt);
-                                                       
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.edit&s_agreement_id='
 . $s_agreement_id);
+                                                       
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.edit&id='
 . $s_agreement_id);
                                                }
                                        }
                                        else
@@ -834,7 +831,7 @@
                                }
                                elseif (!$values['save'] && !$values['apply'] 
&& !$values['update']):
                                {
-                                       
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.edit&s_agreement_id='
 . $s_agreement_id);
+                                       
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.edit&id='
 . $s_agreement_id);
                                }
                                endif;
                        }
@@ -1016,8 +1013,7 @@
                        $link_data = array
                        (
                                'menuaction'            => 
$this->currentapp.'.uis_agreement.edit',
-                               's_agreement_id'        => $s_agreement_id,
-                               'id'                            => $id
+                               'id'                            => 
$s_agreement_id
                        );
 
                        $dateformat = 
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
@@ -1140,7 +1136,7 @@
 
                function view()
                {
-                       $s_agreement_id = 
get_var('s_agreement_id',array('POST','GET'));
+                       $s_agreement_id = get_var('id',array('POST','GET'));
 
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('s_agreement','attributes_view'));