[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11214] bkbooking: stavanger update
|
From: |
Kjell Arne Espedal |
|
Subject: |
[Fmsystem-commits] [11214] bkbooking: stavanger update |
|
Date: |
Fri, 28 Jun 2013 10:03:22 +0000 |
Revision: 11214
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11214
Author: kjell
Date: 2013-06-28 10:03:22 +0000 (Fri, 28 Jun 2013)
Log Message:
-----------
bkbooking: stavanger update
Modified Paths:
--------------
branches/stavangerkommune/booking/inc/class.sobuilding.inc.php
branches/stavangerkommune/booking/inc/class.uibuilding.inc.php
branches/stavangerkommune/booking/inc/class.uievent.inc.php
branches/stavangerkommune/booking/setup/phpgw_no.lang
branches/stavangerkommune/booking/setup/setup.inc.php
branches/stavangerkommune/booking/setup/tables_current.inc.php
branches/stavangerkommune/booking/setup/tables_update.inc.php
branches/stavangerkommune/booking/templates/base/building_form.xsl
branches/stavangerkommune/bookingfrontend/templates/stavanger/building.xsl
Modified: branches/stavangerkommune/booking/inc/class.sobuilding.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.sobuilding.inc.php
2013-06-28 09:54:17 UTC (rev 11213)
+++ branches/stavangerkommune/booking/inc/class.sobuilding.inc.php
2013-06-28 10:03:22 UTC (rev 11214)
@@ -10,6 +10,7 @@
'id' => array('type' => 'int'),
'name' => array('type' => 'string',
'query' => true, 'required' => true),
'homepage' => array('type' => 'string'),
+ 'calendar_text' => array('type' =>
'string'),
'description' => array('type' =>
'string'),
'phone' => array('type' => 'string'),
'email' => array('type' => 'string'),
Modified: branches/stavangerkommune/booking/inc/class.uibuilding.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uibuilding.inc.php
2013-06-28 09:54:17 UTC (rev 11213)
+++ branches/stavangerkommune/booking/inc/class.uibuilding.inc.php
2013-06-28 10:03:22 UTC (rev 11214)
@@ -26,7 +26,7 @@
$this->bo = CreateObject('booking.bobuilding');
self::set_active_menu('booking::buildings');
- $this->fields = array('name', 'homepage',
'description', 'email', 'tilsyn_name', 'tilsyn_email', 'tilsyn_phone',
'street', 'zip_code', 'city', 'district', 'phone', 'active',
'location_code','deactivate_application','deactivate_calendar','deactivate_sendmessage');
+ $this->fields = array('name', 'homepage',
'description', 'email', 'tilsyn_name', 'tilsyn_email', 'tilsyn_phone',
'street', 'zip_code', 'city', 'district', 'phone', 'active',
'location_code','deactivate_application','deactivate_calendar','deactivate_sendmessage','calendar_text');
}
public function properties()
@@ -177,6 +177,7 @@
$building['buildings_link'] =
self::link(array('menuaction' => 'booking.uibuilding.index'));
$building['cancel_link'] =
self::link(array('menuaction' => 'booking.uibuilding.show', 'id' =>
$building['id']));
$building['top-nav-bar-buildings'] = lang('Buildings');
+
$errors = array();
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
Modified: branches/stavangerkommune/booking/inc/class.uievent.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uievent.inc.php 2013-06-28
09:54:17 UTC (rev 11213)
+++ branches/stavangerkommune/booking/inc/class.uievent.inc.php 2013-06-28
10:03:22 UTC (rev 11214)
@@ -730,12 +730,16 @@
{
$event_id = phpgw::get_var('event_id', 'GET');
$application_id = phpgw::get_var('application_id',
'GET');
-
- $this->bo->so->delete_event($event_id);
- if (isset($application_id))
+
+ if ($GLOBALS['phpgw']->acl->check('admin',
phpgwapi_acl::ADD, 'booking')) {
+ $this->bo->so->delete_event($event_id);
+ }
+ if (isset($application_id)) {
$this->redirect(array('menuaction' =>
'booking.uiapplication.show', 'id'=>$application_id));
- else
+ } else {
$this->redirect(array('menuaction' =>
'booking.uievent.index'));
+ }
+
}
public function info()
{
Modified: branches/stavangerkommune/booking/setup/phpgw_no.lang
===================================================================
--- branches/stavangerkommune/booking/setup/phpgw_no.lang 2013-06-28
09:54:17 UTC (rev 11213)
+++ branches/stavangerkommune/booking/setup/phpgw_no.lang 2013-06-28
10:03:22 UTC (rev 11214)
@@ -618,3 +618,4 @@
Author booking no Forfatter
Robots booking no Søkerobot parameter
Frontpage text booking no Forside tekst
+Calendar text booking no Tekst bak kalender knapp.
Modified: branches/stavangerkommune/booking/setup/setup.inc.php
===================================================================
--- branches/stavangerkommune/booking/setup/setup.inc.php 2013-06-28
09:54:17 UTC (rev 11213)
+++ branches/stavangerkommune/booking/setup/setup.inc.php 2013-06-28
10:03:22 UTC (rev 11214)
@@ -1,6 +1,6 @@
<?php
$setup_info['booking']['name'] = 'booking';
- $setup_info['booking']['version'] = '0.2.12';
+ $setup_info['booking']['version'] = '0.2.13';
$setup_info['booking']['app_order'] = 9;
$setup_info['booking']['enable'] = 1;
$setup_info['booking']['app_group'] = 'office';
Modified: branches/stavangerkommune/booking/setup/tables_current.inc.php
===================================================================
--- branches/stavangerkommune/booking/setup/tables_current.inc.php
2013-06-28 09:54:17 UTC (rev 11213)
+++ branches/stavangerkommune/booking/setup/tables_current.inc.php
2013-06-28 10:03:22 UTC (rev 11214)
@@ -35,6 +35,7 @@
'district' => array('type' =>
'varchar','precision' => '255', 'nullable' => True),
'city' => array('type' => 'varchar','precision'
=> '255', 'nullable' => True),
'description' => array('type' => 'text',
'nullable' => True),
+ 'calendar_text' => array('type' => 'text',
'nullable' => True),
),
'pk' => array('id'),
'fk' => array(),
Modified: branches/stavangerkommune/booking/setup/tables_update.inc.php
===================================================================
--- branches/stavangerkommune/booking/setup/tables_update.inc.php
2013-06-28 09:54:17 UTC (rev 11213)
+++ branches/stavangerkommune/booking/setup/tables_update.inc.php
2013-06-28 10:03:22 UTC (rev 11214)
@@ -2681,8 +2681,8 @@
$test[] = '0.2.11';
/**
* Update booking version from 0.2.11 to 0.2.12
- * add description to bb_office
*
+ *
*/
function booking_upgrade0_2_11()
{
@@ -2702,3 +2702,20 @@
}
}
+ $test[] = '0.2.12';
+ /**
+ * Update booking version from 0.2.12 to 0.2.13
+ * add description to bb_office
+ *
+ */
+ function booking_upgrade0_2_12()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_building ADD COLUMN calendar_text varchar(50)");
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['booking']['currentver'] =
'0.2.13';
+ return $GLOBALS['setup_info']['booking']['currentver'];
+ }
+ }
+
Modified: branches/stavangerkommune/booking/templates/base/building_form.xsl
===================================================================
--- branches/stavangerkommune/booking/templates/base/building_form.xsl
2013-06-28 09:54:17 UTC (rev 11213)
+++ branches/stavangerkommune/booking/templates/base/building_form.xsl
2013-06-28 10:03:22 UTC (rev 11214)
@@ -152,6 +152,15 @@
<div class="clr"/>
<dl class="form-col">
+ <dt><label
for="field_calendar_text"><xsl:value-of select="php:function('lang', 'Calendar
text')" /></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_calendar_text"
name="calendar_text" type="text"><xsl:value-of
select="building/calendar_text"/></textarea>
+ </dd>
+ </dl>
+
+ <div class="clr"/>
+
+ <dl class="form-col">
<dt><label
for="field_description"><xsl:value-of select="php:function('lang',
'Description')" /></label></dt>
<dd class="yui-skin-sam">
<textarea id="field_description"
name="description" type="text"><xsl:value-of
select="building/description"/></textarea>
Modified:
branches/stavangerkommune/bookingfrontend/templates/stavanger/building.xsl
===================================================================
--- branches/stavangerkommune/bookingfrontend/templates/stavanger/building.xsl
2013-06-28 09:54:17 UTC (rev 11213)
+++ branches/stavangerkommune/bookingfrontend/templates/stavanger/building.xsl
2013-06-28 10:03:22 UTC (rev 11214)
@@ -19,7 +19,12 @@
<dl class="proplist-col main">
<div>
<button
onclick="window.location.href='{schedule_link}'"><xsl:value-of
select="php:function('lang', 'Building schedule')" /></button>
- - Søk ledig tid/informasjon om hva som
skjer
+ <xsl:if test="not(calendar_text and
normalize-space(calendar_text))">
+ - Søk ledig tid/informasjon om hva som
skjer
+ </xsl:if>
+ <xsl:if test="calendar_text and
normalize-space(calendar_text)">
+ - <xsl:value-of select="calendar_text"
disable-output-escaping="yes"/>
+ </xsl:if>
</div>
<xsl:if test="normalize-space(description)">
<dl class="proplist description">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11214] bkbooking: stavanger update,
Kjell Arne Espedal <=