[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7116] bkbooking: updated organization and group
|
From: |
Kjell Arne Espedal |
|
Subject: |
[Fmsystem-commits] [7116] bkbooking: updated organization and group |
|
Date: |
Mon, 14 Mar 2011 09:26:31 +0000 |
Revision: 7116
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7116
Author: kjell
Date: 2011-03-14 09:26:30 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
bkbooking: updated organization and group
Modified Paths:
--------------
trunk/booking/inc/class.sogroup.inc.php
trunk/booking/inc/class.soorganization.inc.php
trunk/booking/inc/class.uigroup.inc.php
trunk/booking/inc/class.uiorganization.inc.php
trunk/booking/setup/phpgw_no.lang
trunk/booking/setup/setup.inc.php
trunk/booking/setup/tables_current.inc.php
trunk/booking/setup/tables_update.inc.php
trunk/booking/templates/base/group_edit.xsl
trunk/booking/templates/base/organization_edit.xsl
trunk/bookingfrontend/setup/setup.inc.php
Modified: trunk/booking/inc/class.sogroup.inc.php
===================================================================
--- trunk/booking/inc/class.sogroup.inc.php 2011-03-14 09:19:40 UTC (rev
7115)
+++ trunk/booking/inc/class.sogroup.inc.php 2011-03-14 09:26:30 UTC (rev
7116)
@@ -10,6 +10,7 @@
array(
'id' => array('type'
=> 'int'),
'active' => array('type'
=> 'int', 'required' => true),
+ 'show_in_portal' =>
array('type' => 'int', 'required'=>true),
'organization_id' => array('type'
=> 'int', 'required' => true),
'shortname' => array('type'
=> 'string', 'required' => False, 'query' => True),
'description' => array('type' =>
'string', 'query' => true, 'required' => false,),
Modified: trunk/booking/inc/class.soorganization.inc.php
===================================================================
--- trunk/booking/inc/class.soorganization.inc.php 2011-03-14 09:19:40 UTC
(rev 7115)
+++ trunk/booking/inc/class.soorganization.inc.php 2011-03-14 09:26:30 UTC
(rev 7116)
@@ -21,7 +21,8 @@
'zip_code' => array('type'
=> 'string'),
'district' => array('type'
=> 'string'),
'city' => array('type'
=> 'string'),
- 'active' =>
array('type' => 'int', 'required'=>true),
+ 'active' => array('type'
=> 'int', 'required'=>true),
+ 'show_in_portal' =>
array('type' => 'int', 'required'=>true),
'activity_id' => array('type' =>
'int', 'required' => true),
'customer_identifier_type'
=> array('type' => 'string', 'required' => False),
'customer_number'
=> array('type' => 'string', 'required' => False),
Modified: trunk/booking/inc/class.uigroup.inc.php
===================================================================
--- trunk/booking/inc/class.uigroup.inc.php 2011-03-14 09:19:40 UTC (rev
7115)
+++ trunk/booking/inc/class.uigroup.inc.php 2011-03-14 09:26:30 UTC (rev
7116)
@@ -238,7 +238,7 @@
$errors = array();
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
- $group = array_merge($group,
extract_values($_POST, array('name', 'shortname', 'organization_id',
'organization_name', 'description', 'contacts', 'active', 'activity_id')));
+ $group = array_merge($group,
extract_values($_POST, array('name', 'shortname', 'organization_id',
'organization_name', 'description', 'contacts', 'active', 'activity_id',
'show_in_portal')));
if (!isset($group["active"]))
{
$group['active'] = '1';
Modified: trunk/booking/inc/class.uiorganization.inc.php
===================================================================
--- trunk/booking/inc/class.uiorganization.inc.php 2011-03-14 09:19:40 UTC
(rev 7115)
+++ trunk/booking/inc/class.uiorganization.inc.php 2011-03-14 09:26:30 UTC
(rev 7116)
@@ -33,7 +33,7 @@
'street',
'zip_code', 'city', 'district',
'description', 'contacts', 'active',
'organization_number', 'activity_id',
-
'customer_number', 'customer_internal');
+
'customer_number', 'customer_internal', 'show_in_portal');
}
Modified: trunk/booking/setup/phpgw_no.lang
===================================================================
--- trunk/booking/setup/phpgw_no.lang 2011-03-14 09:19:40 UTC (rev 7115)
+++ trunk/booking/setup/phpgw_no.lang 2011-03-14 09:26:30 UTC (rev 7116)
@@ -487,3 +487,4 @@
Can not create a booking in the past booking no Du kan ikke opprette en
booking i fortiden.
Allocations with existing allocations or bookings (%1) booking no
Tildeinger med eksisterende tildelinger eller bookinger (%1)
Contact information name is to long. max 50 characters booking no Navn i
kontakt informasjon er for langt. Maks 50 tegn
+Show in portal booking no Vis i portal
Modified: trunk/booking/setup/setup.inc.php
===================================================================
--- trunk/booking/setup/setup.inc.php 2011-03-14 09:19:40 UTC (rev 7115)
+++ trunk/booking/setup/setup.inc.php 2011-03-14 09:26:30 UTC (rev 7116)
@@ -1,6 +1,6 @@
<?php
$setup_info['booking']['name'] = 'booking';
- $setup_info['booking']['version'] = '0.2.04';
+ $setup_info['booking']['version'] = '0.2.05';
$setup_info['booking']['app_order'] = 9;
$setup_info['booking']['enable'] = 1;
$setup_info['booking']['app_group'] = 'office';
Modified: trunk/booking/setup/tables_current.inc.php
===================================================================
--- trunk/booking/setup/tables_current.inc.php 2011-03-14 09:19:40 UTC (rev
7115)
+++ trunk/booking/setup/tables_current.inc.php 2011-03-14 09:26:30 UTC (rev
7116)
@@ -87,6 +87,7 @@
'customer_ssn' => array('type' => 'varchar',
'precision' => '12', 'nullable' => True),
'customer_internal' => array('type' => 'int',
'nullable' => False, 'precision' => '4', 'default' => 1),
'shortname' => array('type' =>
'varchar','precision' => '11', 'nullable' => True),
+ 'show_in_portal' => array('type' => 'int',
'nullable' => False,'precision' => '4', 'default' => 0),
),
'pk' => array('id'),
'fk' => array(
@@ -121,6 +122,7 @@
'name' => array('type' => 'varchar','precision'
=> '50','nullable' => False),
'activity_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'shortname' => array('type' =>
'varchar','precision' => '11', 'nullable' => True),
+ 'show_in_portal' => array('type' => 'int',
'nullable' => False,'precision' => '4', 'default' => 0),
),
'pk' => array('id'),
'fk' => array(
Modified: trunk/booking/setup/tables_update.inc.php
===================================================================
--- trunk/booking/setup/tables_update.inc.php 2011-03-14 09:19:40 UTC (rev
7115)
+++ trunk/booking/setup/tables_update.inc.php 2011-03-14 09:26:30 UTC (rev
7116)
@@ -2455,4 +2455,27 @@
}
}
+ $test[] = '0.2.04';
+ /**
+ * Update booking version from 0.2.02 to 0.2.03
+ * Add custom fields to request
+ *
+ */
+ function booking_upgrade0_2_04()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_organization ADD COLUMN show_in_portal int NOT NULL DEFAULT 0");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("UPDATE
bb_organization SET show_in_portal = 0");
+
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_group ADD COLUMN show_in_portal int NOT NULL DEFAULT 0");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("UPDATE bb_group
SET show_in_portal = 0");
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['booking']['currentver'] =
'0.2.05';
+ return $GLOBALS['setup_info']['booking']['currentver'];
+ }
+ }
+
Modified: trunk/booking/templates/base/group_edit.xsl
===================================================================
--- trunk/booking/templates/base/group_edit.xsl 2011-03-14 09:19:40 UTC (rev
7115)
+++ trunk/booking/templates/base/group_edit.xsl 2011-03-14 09:26:30 UTC (rev
7116)
@@ -77,6 +77,23 @@
</select>
</dd>
</xsl:if>
+ <dt><label for="field_show_in_portal"><xsl:value-of
select="php:function('lang', 'Show in portal')"/></label></dt>
+ <dd>
+ <select id="field_show_in_portal"
name="show_in_portal">
+ <option value="0">
+ <xsl:if test="group/show_in_portal=0">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'No')"/>
+ </option>
+ <option value="1">
+ <xsl:if test="group/show_in_portal=1">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Yes')"/>
+ </option>
+ </select>
+ </dd>
</dl>
<div style='clear:left; padding:0; margin:0'/>
Modified: trunk/booking/templates/base/organization_edit.xsl
===================================================================
--- trunk/booking/templates/base/organization_edit.xsl 2011-03-14 09:19:40 UTC
(rev 7115)
+++ trunk/booking/templates/base/organization_edit.xsl 2011-03-14 09:26:30 UTC
(rev 7116)
@@ -169,6 +169,23 @@
</select>
</dd>
</xsl:if>
+ <dt><label for="field_show_in_portal"><xsl:value-of
select="php:function('lang', 'Show in portal')"/></label></dt>
+ <dd>
+ <select id="field_show_in_portal"
name="show_in_portal">
+ <option value="0">
+ <xsl:if test="organization/show_in_portal=0">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'No')"/>
+ </option>
+ <option value="1">
+ <xsl:if test="organization/show_in_portal=1">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Yes')"/>
+ </option>
+ </select>
+ </dd>
</dl>
<div style='clear:left; padding:0; margin:0'/>
Modified: trunk/bookingfrontend/setup/setup.inc.php
===================================================================
--- trunk/bookingfrontend/setup/setup.inc.php 2011-03-14 09:19:40 UTC (rev
7115)
+++ trunk/bookingfrontend/setup/setup.inc.php 2011-03-14 09:26:30 UTC (rev
7116)
@@ -21,7 +21,7 @@
$setup_info['bookingfrontend']['depends'][] = array(
'appname' => 'booking',
- 'versions' => Array('0.2.00', '0.2.01','0.2.02','0.2.03')
+ 'versions' => Array('0.2.00',
'0.2.01','0.2.02','0.2.03','0.2.04','0.2.05')
);
$setup_info['bookingfrontend']['depends'][] = array(
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7116] bkbooking: updated organization and group,
Kjell Arne Espedal <=