[Fmsystem-commits] [7218] Merge 7215:7217 from trunk

[Sigurd Nes]

Revision: 7218
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7218
Author:   sigurdne
Date:     2011-04-13 19:17:46 +0000 (Wed, 13 Apr 2011)
Log Message:
-----------
Merge 7215:7217 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/booking/setup/tables_current.inc.php
    branches/Version-1_0-branch/booking/templates/base/application.xsl

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
   + 
/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

Modified: branches/Version-1_0-branch/booking/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/tables_current.inc.php    
2011-04-13 14:45:57 UTC (rev 7217)
+++ branches/Version-1_0-branch/booking/setup/tables_current.inc.php    
2011-04-13 19:17:46 UTC (rev 7218)
@@ -168,7 +168,7 @@
                'bb_application' => array(
                        'fd' => array(
                                'id' => array('type' => 'auto', 'nullable' => 
False),
-                               'id_string' => array('type' => 'varchar', 
'nullable' => False, 'default' => '0'),
+                               'id_string' => array('type' => 
'varchar','precision' => '20', 'nullable' => False, 'default' => '0'),
                                'active' => array('type' => 'int', 'nullable' 
=> False,'precision' => '4', 'default' => 1),
                                'display_in_dashboard' => array('type' => 
'int', 'nullable' => False, 'precision' => '4', 'default' => 1),
                                'status' => array('type' => 'text', 
'nullable'=> False),
@@ -201,7 +201,7 @@
                'bb_allocation' => array(
                        'fd' => array(
                                'id' => array('type' => 'auto', 'nullable' => 
False),
-                               'id_string' => array('type' => 'varchar', 
'nullable' => False, 'default' => '0'),
+                               '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' => 50,'nullable' => False),
                                'application_id' => array('type' => 
'int','precision' => '4','nullable' => True),
@@ -516,7 +516,7 @@
                'bb_event' => array(
                        'fd' => array(
                                'id' => array('type' => 'auto','nullable' => 
False),
-                               'id_string' => array('type' => 'varchar', 
'nullable' => False, 'default' => '0'),
+                               'id_string' => array('type' => 
'varchar','precision' => '20', 'nullable' => False, 'default' => '0'),
                                'active' => array('type' => 'int', 'precision' 
=> 4,'nullable' => False,'default' => '1'),
                                'activity_id' => array('type' => 'int', 
'precision' => 4,'nullable' => False),
                                'description' => array('type' => 
'text','nullable' => False),

Modified: branches/Version-1_0-branch/booking/templates/base/application.xsl
===================================================================
--- branches/Version-1_0-branch/booking/templates/base/application.xsl  
2011-04-13 14:45:57 UTC (rev 7217)
+++ branches/Version-1_0-branch/booking/templates/base/application.xsl  
2011-04-13 19:17:46 UTC (rev 7218)
@@ -142,7 +142,7 @@
                                        bookingParams[<xsl:value-of 
select="id"/>] = <xsl:value-of select="booking_params"/>;
                                        eventParams[<xsl:value-of 
select="id"/>] = <xsl:value-of select="event_params"/>;
                                </script>
-                               <select name="create" 
onchange="if(this.selectedIndex==1) 
YAHOO.booking.postToUrl('index.php?menuaction=booking.uiallocation.add', 
allocationParams[{id}]); if(this.selectedIndex==2) 
YAHOO.booking.postToUrl('index.php?menuaction=booking.uibooking.add', 
eventParams[{id}]); if(this.selectedIndex==3) 
YAHOO.booking.postToUrl('index.php?menuaction=booking.uievent.add', 
eventParams[{id}])">
+                               <select name="create" 
onchange="if(this.selectedIndex==1) 
YAHOO.booking.postToUrl('index.php?menuaction=booking.uievent.add', 
eventParams[{id}]); if(this.selectedIndex==2) 
YAHOO.booking.postToUrl('index.php?menuaction=booking.uibooking.add', 
eventParams[{id}]); if(this.selectedIndex==3) 
YAHOO.booking.postToUrl('index.php?menuaction=booking.uiallocation.add', 
allocationParams[{id}])">
                                        <xsl:if 
test="not(../case_officer/is_current_user)">
                                                <xsl:attribute 
name="disabled">disabled</xsl:attribute>         
                                        </xsl:if>