[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16622] Stable: Merge 16619:16621 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16622] Stable: Merge 16619:16621 from trunk |
|
Date: |
Tue, 25 Apr 2017 08:08:36 -0400 (EDT) |
Revision: 16622
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16622
Author: sigurdne
Date: 2017-04-25 08:08:35 -0400 (Tue, 25 Apr 2017)
Log Message:
-----------
Stable: Merge 16619:16621 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/eventplanner/inc/class.socustomer.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uicustomer.inc.php
branches/Version-2_0-branch/eventplanner/inc/class.uievents.inc.php
branches/Version-2_0-branch/eventplanner/inc/model/class.customer.inc.php
branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
branches/Version-2_0-branch/eventplanner/templates/base/customer.xsl
branches/Version-2_0-branch/eventplannerfrontend/templates/base/customer.xsl
branches/Version-2_0-branch/eventplannerfrontend/templates/base/events.xsl
branches/Version-2_0-branch/phpgwapi/inc/class.socommon.inc.php
branches/Version-2_0-branch/property/inc/class.sosubstitute.inc.php
branches/Version-2_0-branch/property/setup/phpgw_no.lang
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-04-25 12:06:58 UTC (rev 16621)
+++ branches/Version-2_0-branch 2017-04-25 12:08:35 UTC (rev 16622)
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,16603-16608,16610-16614,16616-16618
\ 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,16610-16614,16616-16618,16620-16621
\ No newline at end of property
Modified: branches/Version-2_0-branch/eventplanner/inc/class.socustomer.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.socustomer.inc.php
2017-04-25 12:06:58 UTC (rev 16621)
+++ branches/Version-2_0-branch/eventplanner/inc/class.socustomer.inc.php
2017-04-25 12:08:35 UTC (rev 16622)
@@ -58,6 +58,11 @@
function get_acl_condition( )
{
$acl_condition = parent::get_acl_condition();
+
+ if($this->relaxe_acl)
+ {
+ return $acl_condition;
+ }
$sql = "SELECT object_id, permission FROM
eventplanner_permission WHERE subject_id = {$this->account}";
$this->db->query($sql,__LINE__,__FILE__);
Modified: branches/Version-2_0-branch/eventplanner/inc/class.uicustomer.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uicustomer.inc.php
2017-04-25 12:06:58 UTC (rev 16621)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uicustomer.inc.php
2017-04-25 12:08:35 UTC (rev 16622)
@@ -252,6 +252,8 @@
)
);
+ $config = CreateObject('phpgwapi.config',
'eventplanner')->read();
+ $booking_interval = !empty($config['booking_interval'])
? $config['booking_interval'] : null;
$data = array(
'datatable_def' => $datatable_def,
'form_action' => self::link(array('menuaction'
=> "{$this->currentapp}.uicustomer.save")),
@@ -258,6 +260,7 @@
'cancel_url' => self::link(array('menuaction'
=> "{$this->currentapp}.uicustomer.index",)),
'customer' => $customer,
'category_list' => array('options' =>
$this->get_category_options( $customer->category_id )),
+ 'booking_interval' => $booking_interval,
'mode' => $mode,
'tabs' =>
phpgwapi_jquery::tabview_generate($tabs, $active_tab),
'value_active_tab' => $active_tab
Modified: branches/Version-2_0-branch/eventplanner/inc/class.uievents.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uievents.inc.php
2017-04-25 12:06:58 UTC (rev 16621)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uievents.inc.php
2017-04-25 12:08:35 UTC (rev 16622)
@@ -244,8 +244,6 @@
}
$category =
$this->cats->return_single($application->category_id);
- $config = CreateObject('phpgwapi.config',
'eventplanner')->read();
- $booking_interval = !empty($config['booking_interval'])
? $config['booking_interval'] : null;
$data = array(
'datatable_def' => $datatable_def,
@@ -252,7 +250,6 @@
'cancel_url' => self::link(array('menuaction'
=> "{$this->currentapp}.uievents.index",)),
'application' => $application,
'category_name' => $category[0]['name'],
- 'booking_interval' => $booking_interval,
'status_list' => array('options' =>
$this->get_status_options($application->status)),
'application_type_list' =>
$application_type_list,
'tabs' =>
phpgwapi_jquery::tabview_generate($tabs, $active_tab),
Modified:
branches/Version-2_0-branch/eventplanner/inc/model/class.customer.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/model/class.customer.inc.php
2017-04-25 12:06:58 UTC (rev 16621)
+++ branches/Version-2_0-branch/eventplanner/inc/model/class.customer.inc.php
2017-04-25 12:08:35 UTC (rev 16622)
@@ -106,6 +106,7 @@
'label' => 'id',
'sortable'=> true,
'formatter' =>
'JqueryPortico.formatLink',
+ 'public' => true
),
'owner_id' => array('action'=> PHPGW_ACL_ADD,
'type' => 'int',
@@ -135,6 +136,7 @@
'label' => 'name',
'required' => true,
'query' => true,
+ 'public' => true
),
'address_1' => array('action'=> PHPGW_ACL_ADD |
PHPGW_ACL_EDIT,
'type' => 'string',
Modified: branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
2017-04-25 12:06:58 UTC (rev 16621)
+++ branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
2017-04-25 12:08:35 UTC (rev 16622)
@@ -119,4 +119,5 @@
Time is already booked eventplanner no Tiden er allerede booking
booking interval eventplanner no Booking intervall
days eventplanner no dager
+hours eventplanner no Timer
there is a minimum interval of %1 hours eventplanner no Det er
et minimumsintervall på %1 time(r)
\ No newline at end of file
Modified: branches/Version-2_0-branch/eventplanner/templates/base/customer.xsl
===================================================================
--- branches/Version-2_0-branch/eventplanner/templates/base/customer.xsl
2017-04-25 12:06:58 UTC (rev 16621)
+++ branches/Version-2_0-branch/eventplanner/templates/base/customer.xsl
2017-04-25 12:08:35 UTC (rev 16622)
@@ -350,6 +350,17 @@
</div>
<div id="booking">
<fieldset>
+ <xsl:if test="booking_interval
!= ''">
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="php:function('lang', 'booking interval')"/>
+ </label>
+ <xsl:value-of
select="booking_interval"/>
+ <xsl:text>
</xsl:text>
+ <xsl:value-of
select="php:function('lang', 'hours')"/>
+ </div>
+ </xsl:if>
+
<div class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'booking')"/>
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/customer.xsl
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/templates/base/customer.xsl
2017-04-25 12:06:58 UTC (rev 16621)
+++
branches/Version-2_0-branch/eventplannerfrontend/templates/base/customer.xsl
2017-04-25 12:08:35 UTC (rev 16622)
@@ -276,6 +276,16 @@
</div>
<div id="booking">
<fieldset>
+ <xsl:if test="booking_interval
!= ''">
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="php:function('lang', 'booking interval')"/>
+ </label>
+ <xsl:value-of
select="booking_interval"/>
+ <xsl:text>
</xsl:text>
+ <xsl:value-of
select="php:function('lang', 'hours')"/>
+ </div>
+ </xsl:if>
<div class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'booking')"/>
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/events.xsl
===================================================================
--- branches/Version-2_0-branch/eventplannerfrontend/templates/base/events.xsl
2017-04-25 12:06:58 UTC (rev 16621)
+++ branches/Version-2_0-branch/eventplannerfrontend/templates/base/events.xsl
2017-04-25 12:08:35 UTC (rev 16622)
@@ -65,17 +65,6 @@
</label>
<xsl:value-of
select="category_name"/>
</div>
-
- <xsl:if test="booking_interval != ''">
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'booking interval')"/>
- </label>
- <xsl:value-of
select="booking_interval"/>
- <xsl:text> </xsl:text>
- <xsl:value-of
select="php:function('lang', 'days')"/>
- </div>
- </xsl:if>
<div class="pure-control-group">
<label>
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.socommon.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.socommon.inc.php
2017-04-25 12:06:58 UTC (rev 16621)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.socommon.inc.php
2017-04-25 12:08:35 UTC (rev 16622)
@@ -160,7 +160,7 @@
{
return date($this->dateformat,
strtotime($value));
}
- return $value;
+ return $this->db->stripslashes($value);
}
/**
Modified: branches/Version-2_0-branch/property/inc/class.sosubstitute.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.sosubstitute.inc.php
2017-04-25 12:06:58 UTC (rev 16621)
+++ branches/Version-2_0-branch/property/inc/class.sosubstitute.inc.php
2017-04-25 12:08:35 UTC (rev 16622)
@@ -98,13 +98,27 @@
*/
public function update_substitute( $user_id,
$substitute_user_id = 0 )
{
+ $error = false;
$this->db->transaction_begin();
$this->db->query('DELETE FROM
fm_ecodimb_role_user_substitute WHERE user_id = ' . (int)$user_id, __LINE__,
__FILE__);
if($substitute_user_id)
{
- $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__);
+ /*
+ * Check for circle reference
+ */
+ $sql = 'SELECT id FROM
fm_ecodimb_role_user_substitute WHERE substitute_user_id =' . (int) $user_id .
' AND user_id = ' . (int) $substitute_user_id;
+ $this->db->query($sql, __LINE__, __FILE__);
+ if($this->db->next_record())
+ {
+
phpgwapi_cache::message_set(lang('substitute') . ' ' .lang('circle reference'),
'error');
+ $error = true;
+ }
+ else
+ {
+ $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())
+ if($this->db->transaction_commit() && !$error)
{
if($substitute_user_id)
{
Modified: branches/Version-2_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/property/setup/phpgw_no.lang 2017-04-25
12:06:58 UTC (rev 16621)
+++ branches/Version-2_0-branch/property/setup/phpgw_no.lang 2017-04-25
12:08:35 UTC (rev 16622)
@@ -2106,4 +2106,5 @@
report property no Rapport
canceled property no Kansellert
substitute property no Vikar
-set substitute property no Sett vikar
\ No newline at end of file
+set substitute property no Sett vikar
+circle reference property no Sirkelreferanse
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16622] Stable: Merge 16619:16621 from trunk,
sigurdne <=