[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11446] Merge 11443:11445 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11446] Merge 11443:11445 from trunk |
|
Date: |
Tue, 12 Nov 2013 08:45:36 +0000 |
Revision: 11446
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11446
Author: sigurdne
Date: 2013-11-12 08:45:35 +0000 (Tue, 12 Nov 2013)
Log Message:
-----------
Merge 11443:11445 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/setup/setup.inc.php
branches/Version-1_0-branch/activitycalendarfrontend/setup/setup.inc.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/bookingfrontend/setup/setup.inc.php
branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
branches/Version-1_0-branch/property/inc/class.soentity.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,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442
+
/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,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445
Modified: branches/Version-1_0-branch/activitycalendar/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/setup/setup.inc.php
2013-11-12 08:43:05 UTC (rev 11445)
+++ branches/Version-1_0-branch/activitycalendar/setup/setup.inc.php
2013-11-12 08:45:35 UTC (rev 11446)
@@ -30,7 +30,7 @@
$setup_info['activitycalendar']['depends'][] = array(
'appname' => 'booking',
- 'versions' =>
array('0.2.05','0.2.06','0.2.07','0.2.08','0.2.09','0.2.10', '0.2.11')
+ 'versions' =>
array('0.2.05','0.2.06','0.2.07','0.2.08','0.2.09','0.2.10', '0.2.11','0.2.12')
);
$setup_info['activitycalendar']['depends'][] = array(
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendarfrontend/setup/setup.inc.php
2013-11-12 08:43:05 UTC (rev 11445)
+++ branches/Version-1_0-branch/activitycalendarfrontend/setup/setup.inc.php
2013-11-12 08:45:35 UTC (rev 11446)
@@ -22,7 +22,7 @@
$setup_info['activitycalendarfrontend']['depends'][] = array(
'appname' => 'booking',
- 'versions' => Array('0.2.00', '0.2.01', '0.2.02', '0.2.03', '0.2.04',
'0.2.05', '0.2.06', '0.2.07', '0.2.08', '0.2.09', '0.2.10', '0.2.11')
+ 'versions' => Array('0.2.00', '0.2.01', '0.2.02', '0.2.03', '0.2.04',
'0.2.05', '0.2.06', '0.2.07', '0.2.08', '0.2.09', '0.2.10', '0.2.11','0.2.12')
);
$setup_info['activitycalendarfrontend']['depends'][] = array(
Modified: branches/Version-1_0-branch/booking/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/setup.inc.php 2013-11-12
08:43:05 UTC (rev 11445)
+++ branches/Version-1_0-branch/booking/setup/setup.inc.php 2013-11-12
08:45:35 UTC (rev 11446)
@@ -1,6 +1,6 @@
<?php
$setup_info['booking']['name'] = 'booking';
- $setup_info['booking']['version'] = '0.2.11';
+ $setup_info['booking']['version'] = '0.2.12';
$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
2013-11-12 08:43:05 UTC (rev 11445)
+++ branches/Version-1_0-branch/booking/setup/tables_current.inc.php
2013-11-12 08:45:35 UTC (rev 11446)
@@ -4,7 +4,7 @@
'fd' => array(
'id' => array('type' => 'auto', 'nullable' =>
FALSE),
'parent_id' => array('type' =>
'int','precision' => '4','nullable' => TRUE),
- 'name' => array('type' => 'varchar','precision'
=> '50','nullable' => FALSE),
+ 'name' => array('type' => 'varchar','precision'
=> '150','nullable' => FALSE),
'description' => array('type' =>
'varchar','precision' => '10000','nullable' => FALSE),
'active' => array('type' => 'int', 'nullable'
=> False,'precision' => '4', 'default' => 1),
),
@@ -22,7 +22,7 @@
'deactivate_calendar' => array('type' => 'int',
'nullable' => False,'precision' => '4', 'default' => 0),
'deactivate_application' => array('type' =>
'int', 'nullable' => False,'precision' => '4', 'default' => 0),
'deactivate_sendmessage' => array('type' =>
'int', 'nullable' => False,'precision' => '4', 'default' => 0),
- 'name' => array('type' => 'varchar','precision'
=> '50','nullable' => False),
+ 'name' => array('type' => 'varchar','precision'
=> '150','nullable' => False),
'homepage' => array('type' => 'text',
'nullable' => False),
'location_code' => array('type' =>
'varchar','precision' => '50','nullable' => True),
'phone' => array('type' =>
'varchar','precision' => '50','nullable' => True),
@@ -55,7 +55,7 @@
'fd' => array(
'id' => array('type' => 'auto', 'nullable' =>
false),
'ssn' => array('type' => 'varchar', 'precision'
=> '12', 'nullable' => True,),
- 'name' => array('type' => 'varchar','precision'
=> '50','nullable' => False),
+ 'name' => array('type' => 'varchar','precision'
=> '150','nullable' => False),
'homepage' => array('type' => 'text',
'nullable' => True),
'phone' => array('type' =>
'varchar','precision' => '50','nullable' => True),
'email' => array('type' =>
'varchar','precision' => '50','nullable' => True),
@@ -71,7 +71,7 @@
'id' => array('type' => 'auto', 'nullable' =>
false),
'organization_number' => array('type' =>
'varchar', 'precision' => '9', 'nullable' => False, 'default' => ''),
'active' => array('type' => 'int', 'nullable'
=> False,'precision' => '4', 'default' => 1),
- 'name' => array('type' => 'varchar','precision'
=> '50','nullable' => False),
+ 'name' => array('type' => 'varchar','precision'
=> '150','nullable' => False),
'homepage' => array('type' => 'text',
'nullable' => True),
'phone' => array('type' =>
'varchar','precision' => '50','nullable' => True),
'email' => array('type' =>
'varchar','precision' => '50','nullable' => True),
@@ -100,7 +100,7 @@
'id' => array('type' => 'auto', 'nullable' =>
false),
'active' => array('type' => 'int', 'nullable'
=> False,'precision' => '4', 'default' => 1),
'building_id' => array('type' =>
'int','precision' => '4','nullable' => False),
- 'name' => array('type' => 'varchar','precision'
=> '50','nullable' => False),
+ 'name' => array('type' => 'varchar','precision'
=> '150','nullable' => False),
'type' => array('type' => 'varchar',
'precision' => '50', 'nullable' => False),
'description' => array('type' => 'text',
'nullable' => True),
'activity_id' => array('type' =>
'int','precision' => '4','nullable' => False),
@@ -119,7 +119,7 @@
'active' => array('type' => 'int', 'nullable'
=> False,'precision' => '4', 'default' => 1),
'organization_id' => array('type' =>
'int','precision' => '4','nullable' => False),
'description' => array('type' => 'text',
'nullable' => True),
- 'name' => array('type' => 'varchar','precision'
=> '50','nullable' => False),
+ 'name' => array('type' => 'varchar','precision'
=> '150','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),
@@ -137,7 +137,7 @@
'officer_id' => array('type' => 'int',
'precision'=> '4', 'nullable' => false),
'active' => array('type' => 'int', 'nullable'
=> False,'precision' => '4', 'default' => 1),
'building_id' => array('type' =>
'int','precision' => '4','nullable' => False),
- 'name' => array('type' => 'varchar','precision'
=> '50','nullable' => False),
+ 'name' => array('type' => 'varchar','precision'
=> '150','nullable' => False),
'status' => array('type' =>
'varchar','precision' => '10','nullable' => False),
'from_' => array('type' => 'date','nullable' =>
False),
'to_' => array('type' => 'date','nullable' =>
False),
@@ -175,7 +175,7 @@
'created' => array('type' => 'timestamp',
'nullable'=> False, 'default' => 'current_timestamp'),
'modified' => array('type' => 'timestamp',
'nullable'=> False),
'frontend_modified' => array('type' =>
'timestamp', 'nullable'=> True),
- 'building_name' => array('type' => 'varchar',
'precision' => 100,'nullable' => False, 'default' => 'changeme'),
+ 'building_name' => array('type' => 'varchar',
'precision' => 150,'nullable' => False, 'default' => 'changeme'),
'activity_id' => array('type' =>
'int','precision' => '4','nullable' => False),
'description' => array('type' => 'text',
'nullable' => False),
'contact_name' => array('type' => 'text',
'nullable' => False),
@@ -203,7 +203,7 @@
'id' => array('type' => 'auto', 'nullable' =>
False),
'id_string' => array('type' =>
'varchar','precision' => '20', 'nullable' => False, 'default' => '0'),
'active' => array('type' => 'int', 'nullable'
=> False,'precision' => '4', 'default' => 1),
- 'building_name' => array('type' => 'varchar',
'precision' => 100,'nullable' => False, 'default' => 'changeme'),
+ 'building_name' => array('type' => 'varchar',
'precision' => 150,'nullable' => False, 'default' => 'changeme'),
'application_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'organization_id' => array('type' =>
'int','precision' => '4','nullable' => False),
'from_' => array('type' =>
'timestamp','nullable' => False),
@@ -226,7 +226,7 @@
'group_id' => array('type' => 'int',
'precision' => 4,'nullable' => False),
'from_' => array('type' =>
'timestamp','nullable' => False),
'to_' => array('type' => 'timestamp','nullable'
=> False),
- 'building_name' => array('type' => 'varchar',
'precision' => 100,'nullable' => False, 'default' => 'changeme'),
+ 'building_name' => array('type' => 'varchar',
'precision' => 150,'nullable' => False, 'default' => 'changeme'),
'allocation_id' => array('type' => 'int',
'precision' => 4,'nullable' => True),
'season_id' => array('type' => 'int',
'precision' => 4,'nullable' => False),
'active' => array('type' => 'int', 'precision'
=> 4,'nullable' => False,'default' => '1'),
@@ -485,7 +485,7 @@
'bb_organization_contact' => array(
'fd' => array(
'id' => array('type' => 'auto', 'nullable' =>
false),
- 'name' => array('type' => 'varchar',
'precision' => '50', 'nullable' => True),
+ 'name' => array('type' => 'varchar',
'precision' => '150', 'nullable' => True),
'ssn' => array('type' => 'varchar',
'precision' => '12', 'nullable' => True),
'phone' => array('type' => 'varchar',
'precision' => '50', 'nullable' => True),
'email' => array('type' => 'varchar',
'precision' => '50', 'nullable' => True),
@@ -501,7 +501,7 @@
'bb_group_contact' => array(
'fd' => array(
'id' => array('type' => 'auto', 'nullable' =>
false),
- 'name' => array('type' => 'varchar',
'precision' => '50', 'nullable' => True),
+ 'name' => array('type' => 'varchar',
'precision' => '150', 'nullable' => True),
'phone' => array('type' => 'varchar',
'precision' => '50', 'nullable' => True),
'email' => array('type' => 'varchar',
'precision' => '50', 'nullable' => True),
'group_id' => array('type' => 'int',
'precision' => '4', 'nullable' => false),
@@ -523,12 +523,12 @@
'from_' => array('type' =>
'timestamp','nullable' => False),
'to_' => array('type' => 'timestamp','nullable'
=> False),
'cost' => array('type' => 'decimal',
'precision' => 10, 'scale' => 2,'nullable' => True,'default' => '0.0'),
- 'building_name' => array('type' => 'varchar',
'precision' => 100,'nullable' => False, 'default' => 'changeme'),
- 'contact_name' => array('type' => 'varchar',
'precision' => 50,'nullable' => False),
+ 'building_name' => array('type' => 'varchar',
'precision' => 150,'nullable' => False, 'default' => 'changeme'),
+ 'contact_name' => array('type' => 'varchar',
'precision' => 150,'nullable' => False),
'contact_email' => array('type' => 'varchar',
'precision' => 50,'nullable' => False),
'contact_phone' => array('type' => 'varchar',
'precision' => 50,'nullable' => False),
'completed' => array('type' => 'int',
'precision' => 4,'nullable' => False,'default' => '0'),
- 'customer_organization_name' => array('type' =>
'varchar', 'precision' => 50,'nullable' => True),
+ 'customer_organization_name' => array('type' =>
'varchar', 'precision' => 150,'nullable' => True),
'customer_organization_id' => array('type' =>
'int', 'precision' => 4,'nullable' => True),
'customer_identifier_type' => array('type' =>
'varchar', 'precision' => 255,'nullable' => True),
'customer_organization_number' => array('type'
=> 'varchar', 'precision' => 9,'nullable' => True),
@@ -757,8 +757,8 @@
'created' => array('type' => 'timestamp',
'nullable' => False,'default' => 'current_timestamp'),
'display_in_dashboard' => array('type' =>
'int', 'nullable' => False, 'precision' => '4', 'default' => 1),
'building_id' => array('type' => 'int',
'precision' => '4'),
- 'building_name' => array('type' => 'varchar',
'precision' => '100','nullable' => False),
- 'name' => array('type' => 'varchar','precision'
=> '50','nullable' => False),
+ 'building_name' => array('type' => 'varchar',
'precision' => '150','nullable' => False),
+ 'name' => array('type' => 'varchar','precision'
=> '150','nullable' => False),
'phone' => array('type' =>
'varchar','precision' => '50','nullable' => true),
'email' => array('type' =>
'varchar','precision' => '50','nullable' => true),
'message' => array('type' => 'text', 'nullable'
=> False),
Modified: branches/Version-1_0-branch/booking/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/tables_update.inc.php
2013-11-12 08:43:05 UTC (rev 11445)
+++ branches/Version-1_0-branch/booking/setup/tables_update.inc.php
2013-11-12 08:45:35 UTC (rev 11446)
@@ -2710,3 +2710,134 @@
return $GLOBALS['setup_info']['booking']['currentver'];
}
}
+
+ $test[] = '0.2.11';
+ /**
+ * Update booking version from 0.2.11 to 0.2.12
+ * alter lenght of name fields
+ *
+ */
+ function booking_upgrade0_2_11()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
+ $GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_activity',
'name',array(
+ 'type' => 'varchar',
+ 'precision' => 150,
+ 'nullable' => False
+ )
+ );
+ $GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_building',
'name',array(
+ 'type' => 'varchar',
+ 'precision' => 150,
+ 'nullable' => False
+ )
+ );
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_contact_person', 'name',array(
+ 'type' => 'varchar',
+ 'precision' => 150,
+ 'nullable' => False
+ )
+ );
+ $GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_organization',
'name',array(
+ 'type' => 'varchar',
+ 'precision' => 150,
+ 'nullable' => False
+ )
+ );
+ $GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_resource',
'name',array(
+ 'type' => 'varchar',
+ 'precision' => 150,
+ 'nullable' => False
+ )
+ );
+ $GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_group',
'name',array(
+ 'type' => 'varchar',
+ 'precision' => 150,
+ 'nullable' => False
+ )
+ );
+ $GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_season',
'name',array(
+ 'type' => 'varchar',
+ 'precision' => 150,
+ 'nullable' => False
+ )
+ );
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_organization_contact',
'name',array(
+ 'type' => 'varchar',
+ 'precision' => 150,
+ 'nullable' => true
+ )
+ );
+ $GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_group_contact',
'name',array(
+ 'type' => 'varchar',
+ 'precision' => 150,
+ 'nullable' => true
+ )
+ );
+
+ $GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_application',
'building_name',array(
+ 'type' => 'varchar',
+ 'precision' => 150,
+ 'nullable' => False,
+ 'default' => 'changeme'
+ )
+ );
+ $GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_allocation',
'building_name',array(
+ 'type' => 'varchar',
+ 'precision' => 150,
+ 'nullable' => False,
+ 'default' => 'changeme'
+ )
+ );
+ $GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_booking',
'building_name',array(
+ 'type' => 'varchar',
+ 'precision' => 150,
+ 'nullable' => False,
+ 'default' => 'changeme'
+ )
+ );
+
+ $GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_event',
'building_name',array(
+ 'type' => 'varchar',
+ 'precision' => 150,
+ 'nullable' => False,
+ 'default' => 'changeme'
+ )
+ );
+
+ $GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_event',
'contact_name',array(
+ 'type' => 'varchar',
+ 'precision' => 150,
+ 'nullable' => false
+ )
+ );
+
+ $GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_event',
'customer_organization_name',array(
+ 'type' => 'varchar',
+ 'precision' => 150,
+ 'nullable' => true
+ )
+ );
+
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_system_message',
'building_name',array(
+ 'type' => 'varchar',
+ 'precision' => 150,
+ 'nullable' => false
+ )
+ );
+
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('bb_system_message', 'name',array(
+ 'type' => 'varchar',
+ 'precision' => 150,
+ 'nullable' => false
+ )
+ );
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['booking']['currentver'] =
'0.2.12';
+ return $GLOBALS['setup_info']['booking']['currentver'];
+ }
+ }
Modified: branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php
2013-11-12 08:43:05 UTC (rev 11445)
+++ branches/Version-1_0-branch/bookingfrontend/setup/setup.inc.php
2013-11-12 08:45:35 UTC (rev 11446)
@@ -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','0.2.04','0.2.05','0.2.06','0.2.07','0.2.08','0.2.09','0.2.10','0.2.11')
+ 'versions' => Array('0.2.00',
'0.2.01','0.2.02','0.2.03','0.2.04','0.2.05','0.2.06','0.2.07','0.2.08','0.2.09','0.2.10','0.2.11','0.2.12')
);
$setup_info['bookingfrontend']['depends'][] = array(
Modified: branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2013-11-12 08:43:05 UTC (rev 11445)
+++ branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2013-11-12 08:45:35 UTC (rev 11446)
@@ -1132,7 +1132,7 @@
$joinmethod =
isset($data['joinmethod'])?$data['joinmethod']:'';
$paranthesis =
isset($data['paranthesis'])?$data['paranthesis']:'';
$lookup =
isset($data['lookup'])?$data['lookup']:'';
- $location_level =
isset($data['location_level'])?$data['location_level']:'';
+ $location_level =
isset($data['location_level']) && $data['location_level'] ?
(int)$data['location_level'] : 0;
$no_address =
isset($data['no_address'])?$data['no_address']:'';
$uicol_address =
isset($data['uicol_address'])?$data['uicol_address']:'';
$force_location =
isset($data['force_location'])?$data['force_location']:'';
@@ -1140,8 +1140,13 @@
$cols_return_lookup = array();
$GLOBALS['phpgw']->config->read();
- $list_location_level =
isset($GLOBALS['phpgw']->config->config_data['list_location_level']) &&
$GLOBALS['phpgw']->config->config_data['list_location_level'] ?
$GLOBALS['phpgw']->config->config_data['list_location_level'] : array();
+ $list_location_level =
isset($GLOBALS['phpgw']->config->config_data['list_location_level']) &&
$GLOBALS['phpgw']->config->config_data['list_location_level'] ?
$GLOBALS['phpgw']->config->config_data['list_location_level'] : array();
+ if($list_location_level > $location_level)
+ {
+ $list_location_level = $location_level;
+ }
+
$soadmin_location =
CreateObject('property.soadmin_location');
$location_types =
$soadmin_location->select_location_type();
$config = $soadmin_location->read_config('');
Modified: branches/Version-1_0-branch/property/inc/class.soentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2013-11-12 08:43:05 UTC (rev 11445)
+++ branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2013-11-12 08:45:35 UTC (rev 11446)
@@ -786,6 +786,7 @@
case 'loc1_name':
$ordermethod = " ORDER BY
fm_location1.loc1_name {$sort}";
break;
+ case 'num':
case 'id':
$ordermethod = " ORDER BY
{$entity_table}.id {$sort}";
break;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11446] Merge 11443:11445 from trunk,
Sigurd Nes <=