[Fmsystem-commits] [15176] fix url

[sigurdne]

Revision: 15176
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15176
Author:   sigurdne
Date:     2016-05-19 07:18:25 +0000 (Thu, 19 May 2016)
Log Message:
-----------
fix url

Modified Paths:
--------------
    trunk/property/inc/class.uiagreement.inc.php
    trunk/property/templates/base/agreement.xsl

Modified: trunk/property/inc/class.uiagreement.inc.php
===================================================================
--- trunk/property/inc/class.uiagreement.inc.php        2016-05-19 07:10:02 UTC 
(rev 15175)
+++ trunk/property/inc/class.uiagreement.inc.php        2016-05-19 07:18:25 UTC 
(rev 15176)
@@ -2088,11 +2088,7 @@
                                $table_header = $list['table_header'];
                        }
 
-                       $link_data = array
-                               (
-                               'menuaction' => 'property.uiagreement.save',
-                               'id' => $agreement_id,
-                       );
+                       $link_data = array('menuaction' => 
'property.uiagreement.index');
 
                        $vendor_data = 
$this->bocommon->initiate_ui_vendorlookup(array(
                                'vendor_id' => $agreement['vendor_id'],
@@ -2149,12 +2145,6 @@
                                $record_limit = $this->bo->total_records;
                        }
 
-                       $link_data2 = array
-                               (
-                               'menuaction' => 'property.uiagreement.view',
-                               'id' => $agreement_id,
-                       );
-
                        //---datatable0 
settings---------------------------------------------------
 
                        $myColumnDefs = array
@@ -2271,7 +2261,6 @@
                                'num_records' => count($content),
                                'lang_total_records' => lang('Total'),
                                'all_records' => $this->bo->total_records,
-                               'link_url' => 
$GLOBALS['phpgw']->link('/index.php', $link_data2),
                                'img_path' => 
$GLOBALS['phpgw']->common->get_image_path('phpgwapi', 'default'),
                                'alarm_data' => $alarm_data,
                                'lang_alarm' => lang('Alarm'),
@@ -2280,7 +2269,7 @@
                                'lang_files' => lang('files'),
                                'lang_filename' => lang('Filename'),
                                'lang_view_file_statustext' => lang('click to 
view file'),
-                               'edit_url' => 
$GLOBALS['phpgw']->link('/index.php', $link_data),
+                               'cancel_url' => 
$GLOBALS['phpgw']->link('/index.php', $link_data),
                                'lang_id' => lang('ID'),
                                'value_agreement_id' => $agreement_id,
                                'lang_category' => lang('category'),

Modified: trunk/property/templates/base/agreement.xsl
===================================================================
--- trunk/property/templates/base/agreement.xsl 2016-05-19 07:10:02 UTC (rev 
15175)
+++ trunk/property/templates/base/agreement.xsl 2016-05-19 07:18:25 UTC (rev 
15176)
@@ -955,10 +955,10 @@
                </div>
                <div class="proplist-col">
                        <table cellpadding="2" cellspacing="2" align="left">
-                               <xsl:variable name="edit_url">
-                                       <xsl:value-of select="edit_url"/>
+                               <xsl:variable name="cancel_url">
+                                       <xsl:value-of select="cancel_url"/>
                                </xsl:variable>
-                               <form name="form" method="post" 
action="{$edit_url}">
+                               <form name="form" method="post" 
action="{$cancel_url}">
                                        <tr>
                                                <td align="left" 
valign="bottom">
                                                        <xsl:variable 
name="lang_cancel">