[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16620] more on eventplanner
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16620] more on eventplanner |
|
Date: |
Tue, 25 Apr 2017 06:51:36 -0400 (EDT) |
Revision: 16620
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16620
Author: sigurdne
Date: 2017-04-25 06:51:35 -0400 (Tue, 25 Apr 2017)
Log Message:
-----------
more on eventplanner
Modified Paths:
--------------
trunk/eventplanner/inc/class.socustomer.inc.php
trunk/eventplanner/inc/class.uicustomer.inc.php
trunk/eventplanner/inc/class.uievents.inc.php
trunk/eventplanner/inc/model/class.customer.inc.php
trunk/eventplanner/setup/phpgw_no.lang
trunk/eventplanner/templates/base/customer.xsl
trunk/eventplannerfrontend/templates/base/customer.xsl
trunk/eventplannerfrontend/templates/base/events.xsl
trunk/phpgwapi/inc/class.socommon.inc.php
Modified: trunk/eventplanner/inc/class.socustomer.inc.php
===================================================================
--- trunk/eventplanner/inc/class.socustomer.inc.php 2017-04-25 09:22:21 UTC
(rev 16619)
+++ trunk/eventplanner/inc/class.socustomer.inc.php 2017-04-25 10:51:35 UTC
(rev 16620)
@@ -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: trunk/eventplanner/inc/class.uicustomer.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uicustomer.inc.php 2017-04-25 09:22:21 UTC
(rev 16619)
+++ trunk/eventplanner/inc/class.uicustomer.inc.php 2017-04-25 10:51:35 UTC
(rev 16620)
@@ -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: trunk/eventplanner/inc/class.uievents.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uievents.inc.php 2017-04-25 09:22:21 UTC
(rev 16619)
+++ trunk/eventplanner/inc/class.uievents.inc.php 2017-04-25 10:51:35 UTC
(rev 16620)
@@ -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: trunk/eventplanner/inc/model/class.customer.inc.php
===================================================================
--- trunk/eventplanner/inc/model/class.customer.inc.php 2017-04-25 09:22:21 UTC
(rev 16619)
+++ trunk/eventplanner/inc/model/class.customer.inc.php 2017-04-25 10:51:35 UTC
(rev 16620)
@@ -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: trunk/eventplanner/setup/phpgw_no.lang
===================================================================
--- trunk/eventplanner/setup/phpgw_no.lang 2017-04-25 09:22:21 UTC (rev
16619)
+++ trunk/eventplanner/setup/phpgw_no.lang 2017-04-25 10:51:35 UTC (rev
16620)
@@ -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: trunk/eventplanner/templates/base/customer.xsl
===================================================================
--- trunk/eventplanner/templates/base/customer.xsl 2017-04-25 09:22:21 UTC
(rev 16619)
+++ trunk/eventplanner/templates/base/customer.xsl 2017-04-25 10:51:35 UTC
(rev 16620)
@@ -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: trunk/eventplannerfrontend/templates/base/customer.xsl
===================================================================
--- trunk/eventplannerfrontend/templates/base/customer.xsl 2017-04-25
09:22:21 UTC (rev 16619)
+++ trunk/eventplannerfrontend/templates/base/customer.xsl 2017-04-25
10:51:35 UTC (rev 16620)
@@ -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: trunk/eventplannerfrontend/templates/base/events.xsl
===================================================================
--- trunk/eventplannerfrontend/templates/base/events.xsl 2017-04-25
09:22:21 UTC (rev 16619)
+++ trunk/eventplannerfrontend/templates/base/events.xsl 2017-04-25
10:51:35 UTC (rev 16620)
@@ -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: trunk/phpgwapi/inc/class.socommon.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.socommon.inc.php 2017-04-25 09:22:21 UTC (rev
16619)
+++ trunk/phpgwapi/inc/class.socommon.inc.php 2017-04-25 10:51:35 UTC (rev
16620)
@@ -160,7 +160,7 @@
{
return date($this->dateformat,
strtotime($value));
}
- return $value;
+ return $this->db->stripslashes($value);
}
/**
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16620] more on eventplanner,
sigurdne <=