Revision: 1440
http://mrbs.svn.sourceforge.net/mrbs/?rev=1440&view=rev
Author: cimorrison
Date: 2010-09-02 14:17:01 +0000 (Thu, 02 Sep 2010)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/provisional_bookings_new_style/tables.pg.pre73.sql
mrbs/branches/provisional_bookings_new_style/tables.pg.sql
mrbs/branches/provisional_bookings_new_style/web/edit_area_room.php
mrbs/branches/provisional_bookings_new_style/web/upgrade/8/pgsql.sql
Property Changed:
----------------
mrbs/branches/provisional_bookings_new_style/
mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql
Property changes on: mrbs/branches/provisional_bookings_new_style
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/trunk:1407-1433
+ /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/trunk:1407-1439
Modified: mrbs/branches/provisional_bookings_new_style/tables.pg.pre73.sql
===================================================================
--- mrbs/branches/provisional_bookings_new_style/tables.pg.pre73.sql
2010-09-02 13:59:58 UTC (rev 1439)
+++ mrbs/branches/provisional_bookings_new_style/tables.pg.pre73.sql
2010-09-02 14:17:01 UTC (rev 1440)
@@ -57,7 +57,7 @@
room_admin_email text,
custom_html text
);
-create index idxSortKey on mrbs_room(sort_key);
+create index mrbs_idxSortKey on mrbs_room(sort_key);
CREATE TABLE mrbs_entry
(
@@ -78,8 +78,8 @@
info_user varchar(80),
info_text text
);
-create index idxStartTime on mrbs_entry(start_time);
-create index idxEndTime on mrbs_entry(end_time);
+create index mrbs_idxStartTime on mrbs_entry(start_time);
+create index mrbs_idxEndTime on mrbs_entry(end_time);
CREATE TABLE mrbs_repeat
(
Modified: mrbs/branches/provisional_bookings_new_style/tables.pg.sql
===================================================================
--- mrbs/branches/provisional_bookings_new_style/tables.pg.sql 2010-09-02
13:59:58 UTC (rev 1439)
+++ mrbs/branches/provisional_bookings_new_style/tables.pg.sql 2010-09-02
14:17:01 UTC (rev 1440)
@@ -70,7 +70,7 @@
room_admin_email text,
custom_html text
);
-create index idxSortKey on mrbs_room(sort_key);
+create index mrbs_idxSortKey on mrbs_room(sort_key);
CREATE TABLE mrbs_entry
(
@@ -91,8 +91,8 @@
info_user varchar(80),
info_text text
);
-create index idxStartTime on mrbs_entry(start_time);
-create index idxEndTime on mrbs_entry(end_time);
+create index mrbs_idxStartTime on mrbs_entry(start_time);
+create index mrbs_idxEndTime on mrbs_entry(end_time);
CREATE TABLE mrbs_repeat
(
Modified: mrbs/branches/provisional_bookings_new_style/web/edit_area_room.php
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/edit_area_room.php
2010-09-02 13:59:58 UTC (rev 1439)
+++ mrbs/branches/provisional_bookings_new_style/web/edit_area_room.php
2010-09-02 14:17:01 UTC (rev 1440)
@@ -311,6 +311,7 @@
$area_min_ba_enabled = (!empty($area_min_ba_enabled)) ? 1 : 0;
$area_max_ba_enabled = (!empty($area_max_ba_enabled)) ? 1 : 0;
$area_private_enabled = (!empty($area_private_enabled)) ? 1 : 0;
+ $area_private_default = (!empty($area_private_default)) ? 1 : 0;
$area_private_mandatory = (!empty($area_private_mandatory)) ? 1 : 0;
$area_approval_enabled = (!empty($area_approval_enabled)) ? 1 : 0;
$area_reminders_enabled = (!empty($area_reminders_enabled)) ? 1 : 0;
Property changes on:
mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/trunk/web/upgrade/5/pgsql.sql:1407-1433
+ /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/trunk/web/upgrade/5/pgsql.sql:1407-1439
Modified: mrbs/branches/provisional_bookings_new_style/web/upgrade/8/pgsql.sql
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/upgrade/8/pgsql.sql
2010-09-02 13:59:58 UTC (rev 1439)
+++ mrbs/branches/provisional_bookings_new_style/web/upgrade/8/pgsql.sql
2010-09-02 14:17:01 UTC (rev 1440)
@@ -3,5 +3,5 @@
ALTER TABLE %DB_TBL_PREFIX%room
ADD COLUMN sort_key varchar(25) DEFAULT '' NOT NULL;
-create index idxSortKey on mrbs_room(sort_key);
+create index %DB_TBL_PREFIX%idxSortKey on %DB_TBL_PREFIX%room(sort_key);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
