|
| From: | Nelson Guerra |
| Subject: | [Fmsystem-commits] [13949] |
| Date: | Thu, 17 Sep 2015 00:07:11 +0000 |
Revision: 13949
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13949
Author: nelson224
Date: 2015-09-17 00:07:10 +0000 (Thu, 17 Sep 2015)
Log Message:
-----------
Modified Paths:
--------------
branches/dev-syncromind/rental/inc/class.uicontract.inc.php
Modified: branches/dev-syncromind/rental/inc/class.uicontract.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uicontract.inc.php 2015-09-16
23:13:57 UTC (rev 13948)
+++ branches/dev-syncromind/rental/inc/class.uicontract.inc.php 2015-09-17
00:07:10 UTC (rev 13949)
@@ -934,42 +934,7 @@
}
break;
case 'contracts_for_adjustment':
- if(!isset($ids) || count($ids) > 0)
- {
- /*$value['ajax'][] = false;
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' => 'rental.uicontract.edit',
-
'id' => $value['id'],
-
'initial_load' => 'no',
-
'adjustment_id' => $adjustment_id)));
- $value['labels'][] = lang('edit');*/
- $url1 =
html_entity_decode(self::link(array('menuaction' => 'rental.uicontract.edit',
-
'id' => $value['id'],
-
'initial_load' => 'no',
-
'adjustment_id' => $adjustment_id)));
- $actions[] = '<a
href="'.$url1.'">'.lang('edit').'</a>';
-
- /*$value['ajax'][] = false;
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'rental.uicontract.copy_contract',
-
'id' => $value['id'],
-
'adjustment_id' => $adjustment_id)));
- $value['labels'][] = lang('copy');*/
- $url2 =
html_entity_decode(self::link(array('menuaction' =>
'rental.uicontract.copy_contract',
-
'id' => $value['id'],
-
'adjustment_id' => $adjustment_id)));
- $actions[] = '<a
href="'.$url2.'">'.lang('copy').'</a>';
- }
- /*$value['ajax'][] = false;
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' => 'rental.uicontract.view',
-
'id' => $value['id'],
-
'initial_load' => 'no',
-
'adjustment_id' => $adjustment_id)));
- $value['labels'][] = lang('show');*/
- $url3 =
html_entity_decode(self::link(array('menuaction' => 'rental.uicontract.view',
-
'id' => $value['id'],
-
'initial_load' => 'no',
-
'adjustment_id' => $adjustment_id)));
- $actions[] = '<a
href="'.$url3.'">'.lang('show').'</a>';
-
+ $actions[] = '';
break;
default:
if(!isset($ids) || count($ids) > 0)
@@ -1346,6 +1311,7 @@
public function view()
{
$contract_id = (int)phpgw::get_var('id');
+ $adjustment_id = (int)phpgw::get_var('adjustment_id');
$mode = 'view';
if (!empty($contract_id))
@@ -1430,11 +1396,18 @@
$current_interval =
$contract->get_adjustment_interval();
$current_share = $contract->get_adjustment_share();
- $link_index = array
+ $link_cancel = array
(
'menuaction' =>
'rental.uicontract.index',
);
+ $cancel_text = 'cancel';
+ if($adjustment_id)
+ {
+ $link_cancel = array('menuaction' =>
'rental.uiadjustment.show_affected_contracts','id' => $adjustment_id);
+ $cancel_text = 'contract_regulation_back';
+ }
+
$tabs = array();
$tabs['details'] = array('label' =>
lang('Details'), 'link' => '#details');
$active_tab = 'details';
@@ -1516,8 +1489,8 @@
$data = array
(
'datatable_def'
=> $datatable_def,
- 'cancel_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_index),
- 'lang_cancel'
=> lang('cancel'),
+ 'cancel_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_cancel),
+ 'lang_cancel'
=> lang($cancel_text),
'value_contract_number'
=> $contract->get_old_contract_id(),
'value_parties'
=> $contract->get_party_name_as_list(),
@@ -1743,7 +1716,7 @@
if($adjustment_id)
{
- $link_cancel = self::link(array('menuaction' =>
'rental.uiadjustment.show_affected_contracts','id' => $adjustment_id));
+ $link_cancel = array('menuaction' =>
'rental.uiadjustment.show_affected_contracts','id' => $adjustment_id);
$cancel_text = 'contract_regulation_back';
}
| [Prev in Thread] | Current Thread | [Next in Thread] |