[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9864] Merge 9859:9863 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9864] Merge 9859:9863 from trunk |
|
Date: |
Wed, 15 Aug 2012 16:17:48 +0000 |
Revision: 9864
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9864
Author: sigurdne
Date: 2012-08-15 16:17:48 +0000 (Wed, 15 Aug 2012)
Log Message:
-----------
Merge 9859:9863 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.sogroup.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
branches/Version-1_0-branch/activitycalendar/templates/base/organization.php
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
branches/Version-1_0-branch/booking/setup/setup.inc.php
branches/Version-1_0-branch/booking/setup/tables_current.inc.php
branches/Version-1_0-branch/booking/setup/tables_update.inc.php
branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2012-08-15 16:15:40 UTC (rev 9863)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2012-08-15 16:17:48 UTC (rev 9864)
@@ -1422,8 +1422,40 @@
$id = intval($activity_id);
$org_id = intval($organization_id);
- $result = $this->db->query("UPDATE activity_activity SET
organization_id={$org_id} WHERE id={$id}", __LINE__,__FILE__);
+ $result = $this->db->query("UPDATE activity_activity SET
organization_id={$org_id} WHERE id={$id}", __LINE__,__FILE__);
return isset($result);
}
+
+ function get_activities_without_groups()
+ {
+ $activities = array();
+ $sql_activities = "select a.*, o.description as org_desc from
activity_activity a, bb_organization o where (a.group_id is null or a.group_id
= 0) and o.id = a.organization_id";
+ $this->db->query($sql_activities, __LINE__, __FILE__);
+ while($this->db->next_record())
+ {
+ $activity_id = $this->db->f('id');
+ $activity_title = $this->db->f('title');
+ $activity_organization = $this->db->f('organization_id');
+ $description = $this->db->f('org_desc');
+
+ $activities[] = array(
+ 'id'=>$activity_id,
+ 'title'=>$activity_title,
+ 'organization'=>$activity_organization,
+ 'description'=>$description
+ );
+ }
+ return $activities;
+ }
+
+ /*
+ * Function to be run once.
+ * Generates new groups based on activity where group is not
registered.
+ * Adds new group to booking
+ */
+ function generate_groups()
+ {
+ //TODO
+ }
}
Modified: branches/Version-1_0-branch/activitycalendar/inc/class.sogroup.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.sogroup.inc.php
2012-08-15 16:15:40 UTC (rev 9863)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.sogroup.inc.php
2012-08-15 16:17:48 UTC (rev 9864)
@@ -181,8 +181,8 @@
function update_group_description($group_id, $desc)
{
- $sql = "UPDATE bb_group SET description={$desc} WHERE
ID={$group_id}";
- $result = $this->db->query($sql, __LINE__, __FILE__);
+ $sql = "UPDATE bb_group SET description='{$desc}' WHERE
ID={$group_id}";
+ $result = $this->db->query($sql, __LINE__, __FILE__);
if(isset($result))
{
return true;
@@ -200,7 +200,7 @@
$phone=$contact['phone'];
$mail=$contact['mail'];
- $sql = "UPDATE bb_group_contact SET NAME='{$name},
PHONE='{$phone}', EMAIL='{$mail}' WHERE id={$id}";
+ $sql = "UPDATE bb_group_contact SET NAME='{$name}',
PHONE='{$phone}', EMAIL='{$mail}' WHERE id={$id}";
$result = $this->db->query($sql, __LINE__, __FILE__);
if(isset($result))
{
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2012-08-15 16:15:40 UTC (rev 9863)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2012-08-15 16:17:48 UTC (rev 9864)
@@ -25,7 +25,8 @@
'edit' => true,
'download' => true,
'send_mail' => true,
- 'get_organization_groups' => true
+ 'get_organization_groups' => true,
+ 'create_groups' => true
);
public function __construct()
@@ -307,12 +308,12 @@
if(isset($g_id) && $g_id > 0)
{
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_group_id(),
true));
-
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_2(),$subject,$body);
+
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_1(),$subject,$body);
}
else if (isset($o_id) && $o_id
> 0)
{
$activity->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($activity->get_organization_id()));
-
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),$subject,$body);
+
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_1(),$subject,$body);
}
}
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'activitycalendar.uiactivities.view', 'id' => $activity->get_id(), 'saved_ok'
=> 'yes'));
@@ -742,5 +743,25 @@
return $returnHTML;
}
+
+ public function create_groups()
+ {
+ //var_dump('Vi skal lage grupper!');
+ $activities = $this->so_activity->get_activities_without_groups();
+ //_debug_array($activities);
+
+ foreach ($activities as $a)
+ {
+ $group_info = array();
+ $group_info['name'] = $a['title'];
+ $group_info['organization_id'] = $a['organization'];
+ $group_info['description'] = $a['description'];
+
+ $cp =
$this->so_contact->get_booking_contact_persons($a['organization']);
+
+ _debug_array($group_info);
+ _debug_array($cp);
+ }
+ }
}
?>
Modified:
branches/Version-1_0-branch/activitycalendar/templates/base/organization.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/templates/base/organization.php
2012-08-15 16:15:40 UTC (rev 9863)
+++
branches/Version-1_0-branch/activitycalendar/templates/base/organization.php
2012-08-15 16:17:48 UTC (rev 9864)
@@ -42,9 +42,12 @@
<?php }?>
</select>
<?php }else{
-
if($organization->get_change_type() == 'new'){?>
+
if($organization->get_change_type() == 'new'){
+
if($organization->get_district()){?>
<?php echo
activitycalendar_soactivity::get_instance()->get_district_from_id($organization->get_district());?>
- <?php }else{
+ <?php }
+
+ }else{
if($organization->get_district() &&
is_numeric($organization->get_district())){?>
<?php echo
activitycalendar_soactivity::get_instance()->get_district_from_id($organization->get_district());?>
<?php }else{?>
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
2012-08-15 16:15:40 UTC (rev 9863)
+++
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
2012-08-15 16:17:48 UTC (rev 9864)
@@ -269,7 +269,7 @@
}
else
{
- $arena_arr = explode($arena_id,"_");
+ $arena_arr = explode("_",$arena_id);
if($arena_arr[0] == 'i')
{
$activity->set_internal_arena($arena_arr[1]);
@@ -544,8 +544,16 @@
$new_state =
phpgw::get_var('state');
// ... set all
parameters
$activity->set_title(phpgw::get_var('title'));
-
$activity->set_arena(phpgw::get_var('arena_id'));
-
$activity->set_internal_arena(phpgw::get_var('internal_arena_id'));
+ $arena_id =
phpgw::get_var('internal_arena_id');
+ $arena_arr =
explode("_",$arena_id);
+ if($arena_arr[0] ==
'i')
+ {
+
$activity->set_internal_arena($arena_arr[1]);
+ }
+ else
+ {
+
$activity->set_arena($arena_arr[1]);
+ }
//$district_array =
phpgw::get_var('district');
$activity->set_district(phpgw::get_var('district'));
$activity->set_office(phpgw::get_var('office'));
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
2012-08-15 16:15:40 UTC (rev 9863)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
2012-08-15 16:17:48 UTC (rev 9864)
@@ -161,7 +161,7 @@
alert("Kategori må fylles ut!");
return false;
}
- if((document.getElementById('internal_arena_id').value == null ||
document.getElementById('internal_arena_id').value == 0) &&
(document.getElementById('new_arena_hidden').value==null ||
document.getElementById('new_arena_hidden').value==''))
+ if((document.getElementById('internal_arena_id').value == null ||
document.getElementById('internal_arena_id').value == 0))
{
alert("Lokale må fylles ut!");
return false;
@@ -326,7 +326,7 @@
}
?>
</optgroup>
- <optgroup label="<?php
echo lang('building') ?>">
+ <optgroup label="<?php
echo lang('external_arena') ?>">
<?php
foreach($arenas as
$arena)
{
@@ -409,9 +409,9 @@
</FIELDSET>
<div class="form-buttons">
<?php
- if ($editable) {
- echo '<input type="submit"
name="save_activity" value="' . lang('save') . '" onclick="return allOK();"/>';
- }
+ if ($editable) {?>
+ <input type="submit"
name="save_activity" value="<?php echo lang('save')?>" onclick="return
allOK();"/>
+ <?php }
?>
</div>
</dl>
Modified: branches/Version-1_0-branch/booking/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/setup.inc.php 2012-08-15
16:15:40 UTC (rev 9863)
+++ branches/Version-1_0-branch/booking/setup/setup.inc.php 2012-08-15
16:17:48 UTC (rev 9864)
@@ -1,6 +1,6 @@
<?php
$setup_info['booking']['name'] = 'booking';
- $setup_info['booking']['version'] = '0.2.09';
+ $setup_info['booking']['version'] = '0.2.10';
$setup_info['booking']['app_order'] = 9;
$setup_info['booking']['enable'] = 1;
$setup_info['booking']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/booking/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/tables_current.inc.php
2012-08-15 16:15:40 UTC (rev 9863)
+++ branches/Version-1_0-branch/booking/setup/tables_current.inc.php
2012-08-15 16:17:48 UTC (rev 9864)
@@ -774,6 +774,7 @@
'fd' => array(
'id' => array('type' => 'auto', 'precision' =>
4,'nullable' => False),
'name' => array('type' => 'varchar',
'precision' => 200,'nullable' => False),
+ 'description' => array('type' => 'text',
'nullable' => true),
'user_id' => array('type' => 'int', 'precision'
=> 4,'nullable' => True),
'entry_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'modified_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
Modified: branches/Version-1_0-branch/booking/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/tables_update.inc.php
2012-08-15 16:15:40 UTC (rev 9863)
+++ branches/Version-1_0-branch/booking/setup/tables_update.inc.php
2012-08-15 16:17:48 UTC (rev 9864)
@@ -2634,4 +2634,27 @@
}
}
+ $test[] = '0.2.09';
+ /**
+ * Update booking version from 0.2.09 to 0.2.10
+ * add description to bb_office
+ *
+ */
+ function booking_upgrade0_2_09()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('bb_office','description',array(
+ 'type' => 'text',
+ 'nullable' => true
+ )
+ );
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['booking']['currentver'] =
'0.2.10';
+ return $GLOBALS['setup_info']['booking']['currentver'];
+ }
+ }
+
+
Modified: branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
2012-08-15 16:15:40 UTC (rev 9863)
+++ branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
2012-08-15 16:17:48 UTC (rev 9864)
@@ -2395,6 +2395,12 @@
'name' =>
'name',
'descr' =>
lang('name'),
'type' =>
'varchar'
+ ),
+ array
+ (
+ 'name' =>
'description',
+ 'descr' =>
lang('description'),
+ 'type' => 'text'
)
),
'edit_msg'
=> lang('edit'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9864] Merge 9859:9863 from trunk,
Sigurd Nes <=