[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16609] Stable: Merge 16602:16608 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16609] Stable: Merge 16602:16608 from trunk |
|
Date: |
Fri, 21 Apr 2017 04:30:29 -0400 (EDT) |
Revision: 16609
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16609
Author: sigurdne
Date: 2017-04-21 04:30:28 -0400 (Fri, 21 Apr 2017)
Log Message:
-----------
Stable: Merge 16602:16608 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/bookingfrontend/inc/custom/default/MinId.php
branches/Version-2_0-branch/helpdesk/inc/class.sogeneric.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.db_adodb.inc.php
branches/Version-2_0-branch/phpgwapi/inc/class.db_pdo.inc.php
branches/Version-2_0-branch/property/inc/class.bodimb_role_user.inc.php
branches/Version-2_0-branch/property/inc/class.botts.inc.php
branches/Version-2_0-branch/property/inc/class.menu.inc.php
branches/Version-2_0-branch/property/inc/class.sodimb_role_user.inc.php
branches/Version-2_0-branch/property/inc/class.uidimb_role_user.inc.php
branches/Version-2_0-branch/property/setup/phpgw_no.lang
branches/Version-2_0-branch/property/setup/setup.inc.php
branches/Version-2_0-branch/property/setup/tables_current.inc.php
branches/Version-2_0-branch/property/setup/tables_update.inc.php
branches/Version-2_0-branch/property/templates/base/config.tpl
Added Paths:
-----------
branches/Version-2_0-branch/property/templates/base/role_user_substitute.xsl
Property Changed:
----------------
branches/Version-2_0-branch/
branches/Version-2_0-branch/bookingfrontend/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-04-21 08:28:31 UTC (rev 16608)
+++ branches/Version-2_0-branch 2017-04-21 08:30:28 UTC (rev 16609)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16587
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608
\ No newline at end of property
Index: branches/Version-2_0-branch/bookingfrontend
===================================================================
--- branches/Version-2_0-branch/bookingfrontend 2017-04-21 08:28:31 UTC (rev
16608)
+++ branches/Version-2_0-branch/bookingfrontend 2017-04-21 08:30:28 UTC (rev
16609)
Property changes on: branches/Version-2_0-branch/bookingfrontend
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/branches/dev-syncromind-2/bookingfrontend:14933-16587
/branches/stavangerkommune/bookingfrontend:9468-12740,12986
-/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297,15312-15335,15585-15617,15621-15630,15714-15764,15813-15814,15820-15849,15889-15900,15902-16046,16101-16130,16144-16212,16297-16305,16307-16314,16316-16318,16385,16387,16393-16395,16399-16402,16586-16588
\ No newline at end of property
+/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297,15312-15335,15585-15617,15621-15630,15714-15764,15813-15814,15820-15849,15889-15900,15902-16046,16101-16130,16144-16212,16297-16305,16307-16314,16316-16318,16385,16387,16393-16395,16399-16402,16586-16588,16603-16608
\ No newline at end of property
Modified:
branches/Version-2_0-branch/bookingfrontend/inc/custom/default/MinId.php
===================================================================
--- branches/Version-2_0-branch/bookingfrontend/inc/custom/default/MinId.php
2017-04-21 08:28:31 UTC (rev 16608)
+++ branches/Version-2_0-branch/bookingfrontend/inc/custom/default/MinId.php
2017-04-21 08:30:28 UTC (rev 16609)
@@ -117,7 +117,12 @@
}
catch (Exception $e)
{
- $status = lang('unable_to_connect_to_database');
+ $GLOBALS['phpgw']->log->error(array(
+ 'text' =>
'bookingfrontend_external_user::get_breg_orgs() : error when trying to connect.
Error: %1',
+ 'p1' => $db->get_error_message(),
+ 'line' => __LINE__,
+ 'file' => __FILE__
+ ));
}
$sql = "SELECT DISTINCT orgnr FROM breg.personcurrent
WHERE fodselsnr ='{$fodselsnr}'";
Modified: branches/Version-2_0-branch/helpdesk/inc/class.sogeneric.inc.php
===================================================================
--- branches/Version-2_0-branch/helpdesk/inc/class.sogeneric.inc.php
2017-04-21 08:28:31 UTC (rev 16608)
+++ branches/Version-2_0-branch/helpdesk/inc/class.sogeneric.inc.php
2017-04-21 08:30:28 UTC (rev 16609)
@@ -239,7 +239,7 @@
'created' =>
array('add' => 'time()'),
'modified' =>
array('edit' => 'time()'),
),
- 'check_grant' => true
+ // 'check_grant' => true
);
break;
@@ -302,7 +302,7 @@
'created' =>
array('add' => 'time()'),
'modified' =>
array('edit' => 'time()'),
),
- 'check_grant' => true
+ // 'check_grant' => true
);
break;
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php 2017-04-21
08:28:31 UTC (rev 16608)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.db.inc.php 2017-04-21
08:30:28 UTC (rev 16609)
@@ -100,6 +100,8 @@
var $persistent = false;
var $delayPointer = false;
+
+ var $error_message = '';
/**
* Constructor
* @param string $query query to be executed (optional)
@@ -171,6 +173,10 @@
}
+ public function get_error_message( )
+ {
+ return $this->error_message;
+ }
/**
* Backward compatibility for get current connection id
* @return bool true
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.db_adodb.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.db_adodb.inc.php
2017-04-21 08:28:31 UTC (rev 16608)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.db_adodb.inc.php
2017-04-21 08:30:28 UTC (rev 16609)
@@ -216,7 +216,7 @@
{
$message = 'could not connect to
server';
}
-
+ $this->error_message = $e->getMessage();
throw new Exception($message);
return false;
}
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.db_pdo.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.db_pdo.inc.php
2017-04-21 08:28:31 UTC (rev 16608)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.db_pdo.inc.php
2017-04-21 08:30:28 UTC (rev 16609)
@@ -245,7 +245,7 @@
{
$message = 'could not connect to
server';
}
-
+ $this->error_message = $e->getMessage();
throw new Exception($message);
return false;
}
Modified:
branches/Version-2_0-branch/property/inc/class.bodimb_role_user.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.bodimb_role_user.inc.php
2017-04-21 08:28:31 UTC (rev 16608)
+++ branches/Version-2_0-branch/property/inc/class.bodimb_role_user.inc.php
2017-04-21 08:30:28 UTC (rev 16609)
@@ -69,4 +69,14 @@
$values = $this->so->edit($data);
return $values;
}
+
+ public function update_substitute( $user_id,
$substitute_user_id )
+ {
+ return $this->so->update_substitute($user_id,
$substitute_user_id);
+ }
+
+ public function get_substitute( $user_id)
+ {
+ return $this->so->get_substitute($user_id);
+ }
}
\ No newline at end of file
Modified: branches/Version-2_0-branch/property/inc/class.botts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.botts.inc.php
2017-04-21 08:28:31 UTC (rev 16608)
+++ branches/Version-2_0-branch/property/inc/class.botts.inc.php
2017-04-21 08:30:28 UTC (rev 16609)
@@ -1821,7 +1821,15 @@
return array();
}
$approval_amount_limit =
!empty($this->config->config_data['approval_amount_limit']) ? (int)
$this->config->config_data['approval_amount_limit'] : 0;
+ $approval_amount_limit2 =
!empty($this->config->config_data['approval_amount_limit2']) ? (int)
$this->config->config_data['approval_amount_limit2'] : 0;
+ $approval_amount_limit1 = 0;
+ if($approval_amount_limit2)
+ {
+ $approval_amount_limit1 =
$approval_amount_limit;
+ $approval_amount_limit = 0;
+ }
+
$config = CreateObject('admin.soconfig',
$GLOBALS['phpgw']->locations->get_id('property', '.ticket'));
$check_external_register=
!!$config->config_data['external_register']['check_external_register'];
$supervisors = array();
@@ -1940,7 +1948,28 @@
unset($prefs);
}
}
+ else if($approval_amount_limit1 > 0 && $amount >
$approval_amount_limit1)
+ {
+ $invoice = CreateObject('property.soinvoice');
+ $level_1_required = true;
+ if($approval_amount_limit2 > 0 && $amount >
$approval_amount_limit2)
+ {
+ $supervisor_id =
$invoice->get_default_dimb_role_user(2, $ecodimb);
+ if($supervisor_id)
+ {
+ $supervisors[$supervisor_id] =
array('id' => $supervisor_id, 'required' => true, 'default' => true);
+ $level_1_required = false;
+ }
+ }
+
+ $supervisor_id =
$invoice->get_default_dimb_role_user(1, $ecodimb);
+ if($supervisor_id)
+ {
+ $supervisors[$supervisor_id] =
array('id' => $supervisor_id, 'required' => $level_1_required, 'default' =>
$level_1_required);
+ }
+ }
+
// if(!$check_external_register &&
!empty($GLOBALS['phpgw_info']['user']['preferences']['property']['approval_from'])
// &&
empty($supervisors[$GLOBALS['phpgw_info']['user']['preferences']['property']['approval_from']]))
// {
Modified: branches/Version-2_0-branch/property/inc/class.menu.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.menu.inc.php 2017-04-21
08:28:31 UTC (rev 16608)
+++ branches/Version-2_0-branch/property/inc/class.menu.inc.php 2017-04-21
08:30:28 UTC (rev 16609)
@@ -334,12 +334,12 @@
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uicategories.index', 'appname' => 'property', 'location' =>
'.invoice.dimb', 'global_cats' => 'true', 'menu_selection' =>
'admin::property::accounting::dimb_roles') )
),
*/
- /*
+
'dimb_role' => array
(
'text' => lang('dimb roles'),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uigeneric.index', 'type' => 'dimb_role') )
- ),
+ ),/*
'dimb_role_user' => array
(
'text' => lang('dimb role
user'),
@@ -787,17 +787,20 @@
{
$menus['preferences'] = array
(
- array
- (
+ array(
'text' =>
$GLOBALS['phpgw']->translation->translate('Preferences', array(), true),
'url' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php', array('appname' =>
'property',
'type' => 'user'))
),
- array
- (
+ array(
'text' =>
$GLOBALS['phpgw']->translation->translate('Grant Access', array(), true),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uiadmin.aclprefs',
'acl_app' =>
'property'))
+ ),
+ array(
+ 'text' => lang('substitute'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uidimb_role_user.substitute',
+ 'acl_app' =>
'property'))
)
);
Modified:
branches/Version-2_0-branch/property/inc/class.sodimb_role_user.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.sodimb_role_user.inc.php
2017-04-21 08:28:31 UTC (rev 16608)
+++ branches/Version-2_0-branch/property/inc/class.sodimb_role_user.inc.php
2017-04-21 08:30:28 UTC (rev 16609)
@@ -303,4 +303,23 @@
return $ok;
}
+
+ public function update_substitute( $user_id,
$substitute_user_id )
+ {
+ $this->db->transaction_begin();
+ $this->db->query('DELETE FROM
fm_ecodimb_role_user_substitute WHERE user_id = ' . (int)$user_id, __LINE__,
__FILE__);
+ $this->db->query('INSERT INTO
fm_ecodimb_role_user_substitute (user_id, substitute_user_id ) VALUES (' .
(int)$user_id . ',' . (int) $substitute_user_id . ')', __LINE__, __FILE__);
+ if($this->db->transaction_commit())
+ {
+ phpgwapi_cache::message_set(lang('substitute')
.': ' . $GLOBALS['phpgw']->accounts->get($substitute_user_id)->__toString(),
'message');
+ return true;
+ }
+ }
+
+ public function get_substitute( $user_id)
+ {
+ $this->db->query('SELECT substitute_user_id FROM
fm_ecodimb_role_user_substitute WHERE user_id = ' . (int)$user_id, __LINE__,
__FILE__);
+ $this->db->next_record();
+ return (int)$this->db->f('substitute_user_id');
+ }
}
\ No newline at end of file
Modified:
branches/Version-2_0-branch/property/inc/class.uidimb_role_user.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uidimb_role_user.inc.php
2017-04-21 08:28:31 UTC (rev 16608)
+++ branches/Version-2_0-branch/property/inc/class.uidimb_role_user.inc.php
2017-04-21 08:30:28 UTC (rev 16609)
@@ -45,6 +45,7 @@
'index' => true,
'query' => true,
'edit' => true,
+ 'substitute' => true
);
function __construct()
@@ -305,4 +306,62 @@
'user_id' => $user_id, 'dimb_id' =>
$dimb_id, 'role_id' => $role_id, 'query' => $query));
}
}
+
+ public function substitute()
+ {
+ $user_id = $this->account_id;
+ $substitute_user_id =
phpgw::get_var('substitute_user_id', 'int', 'POST');
+
+ if($substitute_user_id)
+ {
+ $this->bo->update_substitute($user_id,
$substitute_user_id);
+ }
+
+ $selected = $this->bo->get_substitute($user_id);
+
+ $appname = lang('substitute');
+ $function_msg = lang('set substitute');
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
+
$GLOBALS['phpgw']->xslttpl->add_file(array('role_user_substitute'));
+
+ $data = array
+ (
+ 'form_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uidimb_role_user.substitute')),
+ 'user_list' => array('options' =>
$this->_get_user_list($selected)),
+ );
+
+ $GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('edit' => $data));
+ }
+
+ private function _get_user_list($selected)
+ {
+ $users =
$GLOBALS['phpgw']->acl->get_user_list_right(PHPGW_ACL_EDIT, '.project',
'property');
+ $user_list = array();
+ $selected_found = false;
+ foreach ($users as $user)
+ {
+ $name = (isset($user['account_lastname']) ?
$user['account_lastname'] . ' ' : '') . $user['account_firstname'];
+ $user_list[] = array(
+ 'id' => $user['account_id'],
+ 'name' => $name,
+ 'selected' => $user['account_id'] ==
$selected ? 1 : 0
+ );
+
+ if (!$selected_found)
+ {
+ $selected_found = $user['account_id']
== $selected ? true : false;
+ }
+ }
+ if ($selected && !$selected_found)
+ {
+ $user_list[] = array
+ (
+ 'id' => $selected,
+ 'name' =>
$GLOBALS['phpgw']->accounts->get($selected)->__toString(),
+ 'selected' => 1
+ );
+ }
+ return $user_list;
+ }
+
}
\ No newline at end of file
Modified: branches/Version-2_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/property/setup/phpgw_no.lang 2017-04-21
08:28:31 UTC (rev 16608)
+++ branches/Version-2_0-branch/property/setup/phpgw_no.lang 2017-04-21
08:30:28 UTC (rev 16609)
@@ -2104,4 +2104,6 @@
profile property no Profil
new attribute property no Ny attributt
report property no Rapport
-canceled property no Kansellert
\ No newline at end of file
+canceled property no Kansellert
+substitute property no Vikar
+set substitute property no Sett vikar
\ No newline at end of file
Modified: branches/Version-2_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-2_0-branch/property/setup/setup.inc.php 2017-04-21
08:28:31 UTC (rev 16608)
+++ branches/Version-2_0-branch/property/setup/setup.inc.php 2017-04-21
08:30:28 UTC (rev 16609)
@@ -11,7 +11,7 @@
* @version $Id$
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.711';
+ $setup_info['property']['version'] = '0.9.17.712';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
@@ -153,6 +153,7 @@
'fm_ecodimb',
'fm_ecodimb_role',
'fm_ecodimb_role_user',
+ 'fm_ecodimb_role_user_substitute',
'fm_ecodimd',
'fm_ecologg',
'fm_ecomva',
Modified: branches/Version-2_0-branch/property/setup/tables_current.inc.php
===================================================================
--- branches/Version-2_0-branch/property/setup/tables_current.inc.php
2017-04-21 08:28:31 UTC (rev 16608)
+++ branches/Version-2_0-branch/property/setup/tables_current.inc.php
2017-04-21 08:30:28 UTC (rev 16609)
@@ -1495,6 +1495,17 @@
'ecodimb' => 'id'), 'phpgw_accounts' =>
array('user_id' => 'account_id')),
'uc' => array()
),
+ 'fm_ecodimb_role_user_substitute' => array(
+ 'fd' => array(
+ 'id' => array('type' => 'auto', 'precision' =>
'4', 'nullable' => False),
+ 'user_id' => array('type' => 'int', 'precision'
=> '4', 'nullable' => False),
+ 'substitute_user_id' => array('type' => 'int',
'precision' => '4', 'nullable' => False),
+ ),
+ 'pk' => array('id'),
+ 'ix' => array(),
+ 'fk' => array(),
+ 'uc' => array()
+ ),
'fm_ecodimd' => array(
'fd' => array(
'id' => array('type' => 'varchar', 'precision'
=> '5', 'nullable' => False),
Modified: branches/Version-2_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-2_0-branch/property/setup/tables_update.inc.php
2017-04-21 08:28:31 UTC (rev 16608)
+++ branches/Version-2_0-branch/property/setup/tables_update.inc.php
2017-04-21 08:30:28 UTC (rev 16609)
@@ -9459,7 +9459,7 @@
}
/**
- * Update property version from 0.9.17.709 to 0.9.17.711
+ * Update property version from 0.9.17.710 to 0.9.17.711
*
*/
$test[] = '0.9.17.710';
@@ -9513,3 +9513,35 @@
return $GLOBALS['setup_info']['property']['currentver'];
}
}
+
+ /**
+ * Update property version from 0.9.17.711 to 0.9.17.712
+ *
+ */
+ $test[] = '0.9.17.711';
+
+ function property_upgrade0_9_17_711()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+ $GLOBALS['phpgw']->locations->add('.report', 'Generic report',
'property', $allow_grant = true);
+
+ $GLOBALS['phpgw_setup']->oProc->CreateTable(
+ 'fm_ecodimb_role_user_substitute', array(
+ 'fd' => array(
+ 'id' => array('type' => 'auto',
'precision' => '4', 'nullable' => False),
+ 'user_id' => array('type' => 'int',
'precision' => '4', 'nullable' => False),
+ 'substitute_user_id' => array('type' =>
'int', 'precision' => '4', 'nullable' => False),
+ ),
+ 'pk' => array('id'),
+ 'ix' => array(),
+ 'fk' => array(),
+ 'uc' => array()
+ )
+ );
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.712';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
Modified: branches/Version-2_0-branch/property/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/config.tpl
2017-04-21 08:28:31 UTC (rev 16608)
+++ branches/Version-2_0-branch/property/templates/base/config.tpl
2017-04-21 08:30:28 UTC (rev 16609)
@@ -129,6 +129,12 @@
</td>
</tr>
<tr>
+ <td>{lang_approval_amount_limit} 2:</td>
+ <td>
+ <input
name="newsettings[approval_amount_limit2]"
value="{value_approval_amount_limit2}">
+ </td>
+ </tr>
+ <tr>
<td>{lang_approval_level}:</td>
<td>
<select
name="newsettings[approval_level]">
Copied:
branches/Version-2_0-branch/property/templates/base/role_user_substitute.xsl
(from rev 16608, trunk/property/templates/base/role_user_substitute.xsl)
===================================================================
---
branches/Version-2_0-branch/property/templates/base/role_user_substitute.xsl
(rev 0)
+++
branches/Version-2_0-branch/property/templates/base/role_user_substitute.xsl
2017-04-21 08:30:28 UTC (rev 16609)
@@ -0,0 +1,68 @@
+
+<!-- $Id: tts.xsl 16389 2017-02-28 17:35:22Z sigurdne $ -->
+
+<xsl:template match="data">
+ <xsl:choose>
+ <xsl:when test="view">
+ <xsl:apply-templates select="edit"/>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:call-template name="jquery_phpgw_i18n"/>
+</xsl:template>
+
+
+
+<!-- edit -->
+<xsl:template xmlns:php="http://php.net/xsl"; match="edit">
+ <xsl:variable name="form_action">
+ <xsl:value-of select="form_action"/>
+ </xsl:variable>
+ <form class="pure-form pure-form-aligned" id="form" name="form"
method="post" action="{$form_action}">
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="tabs"/>
+ <div id="general">
+ <fieldset>
+ <div class="pure-control-group">
+ <xsl:variable
name="lang_substitute">
+ <xsl:value-of
select="php:function('lang', 'substitute')"/>
+ </xsl:variable>
+ <label>
+ <xsl:value-of
select="$lang_substitute"/>
+ </label>
+ <select
name="substitute_user_id" id="substitute_user_id">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="$lang_substitute"/>
+ </xsl:attribute>
+ <option value="">
+ <xsl:value-of
select="php:function('lang', 'select')"/>
+ </option>
+ <xsl:apply-templates
select="user_list/options"/>
+ </select>
+ </div>
+ </fieldset>
+ </div>
+ </div>
+ <xsl:variable name="lang_save">
+ <xsl:value-of select="php:function('lang', 'save')"/>
+ </xsl:variable>
+ <input type="submit" class="pure-button pure-button-primary"
name="save">
+ <xsl:attribute name="value">
+ <xsl:value-of select="$lang_save"/>
+ </xsl:attribute>
+ <xsl:attribute name="title">
+ <xsl:value-of select="$lang_save"/>
+ </xsl:attribute>
+ </input>
+ </form>
+</xsl:template>
+
+
+<!-- New template-->
+<xsl:template match="options">
+ <option value="{id}">
+ <xsl:if test="selected != 0">
+ <xsl:attribute name="selected" value="selected"/>
+ </xsl:if>
+ <xsl:value-of disable-output-escaping="yes" select="name"/>
+ </option>
+</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16609] Stable: Merge 16602:16608 from trunk,
sigurdne <=