Revision: 1901
http://mrbs.svn.sourceforge.net/mrbs/?rev=1901&view=rev
Author: cimorrison
Date: 2011-08-28 19:27:20 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
Merged in latest changes from trunk
Modified Paths:
--------------
mrbs/branches/datatables/web/functions.inc
mrbs/branches/datatables/web/mrbs_sql.inc
mrbs/branches/datatables/web/systemdefaults.inc.php
Property Changed:
----------------
mrbs/branches/datatables/
mrbs/branches/datatables/web/upgrade/5/pgsql.sql
Property changes on: mrbs/branches/datatables
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/ics_attachments:1652-1741
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/only_unicode:1747-1749
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
+ /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/ics_attachments:1652-1741
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/only_unicode:1747-1749
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1863-1900
Modified: mrbs/branches/datatables/web/functions.inc
===================================================================
--- mrbs/branches/datatables/web/functions.inc 2011-08-28 19:11:34 UTC (rev
1900)
+++ mrbs/branches/datatables/web/functions.inc 2011-08-28 19:27:20 UTC (rev
1901)
@@ -437,7 +437,7 @@
// and partly because it's easier to do this for the non-JavaScript version.
function genDateSelector($prefix, $day, $month, $year, $form_id='')
{
- global $strftime_format;
+ global $strftime_format, $year_range;
// Make sure we've got a date
if (empty($day) or empty($month) or empty($year))
@@ -457,8 +457,8 @@
$month_js = $month - 1;
// First and last dates to show in year select
- $min = min($year, date("Y")) - 5;
- $max = max($year, date("Y")) + 5;
+ $min = min($year, date("Y")) - $year_range['back'];
+ $max = max($year, date("Y")) + $year_range['ahead'];
$datepicker_baseid = "${prefix}datepicker";
Modified: mrbs/branches/datatables/web/mrbs_sql.inc
===================================================================
--- mrbs/branches/datatables/web/mrbs_sql.inc 2011-08-28 19:11:34 UTC (rev
1900)
+++ mrbs/branches/datatables/web/mrbs_sql.inc 2011-08-28 19:27:20 UTC (rev
1901)
@@ -819,6 +819,7 @@
// Check that we've got an id
if (!isset($id))
{
+ trigger_error("id not set", E_USER_WARNING);
if ($silent)
{
return FALSE;
@@ -903,19 +904,20 @@
$res = sql_query($sql);
if (! $res)
{
+ trigger_error(sql_error(), E_USER_WARNING);
if ($silent)
{
return FALSE;
}
else
{
- trigger_error(sql_error(), E_USER_WARNING);
fatal_error(FALSE, get_vocab("fatal_db_error"));
}
}
if (sql_count($res) < 1)
{
+ trigger_error("No rows found matching id=$id", E_USER_WARNING);
if ($silent)
{
return FALSE;
@@ -959,6 +961,10 @@
FROM $tbl_repeat WHERE id=${row['repeat_id']} LIMIT
1");
if (!$res || (!$extra_row = sql_row_keyed($res, 0)))
{
+ if (!$res)
+ {
+ trigger_error(sql_error(), E_USER_WARNING);
+ }
if ($silent)
{
return FALSE;
Modified: mrbs/branches/datatables/web/systemdefaults.inc.php
===================================================================
--- mrbs/branches/datatables/web/systemdefaults.inc.php 2011-08-28 19:11:34 UTC
(rev 1900)
+++ mrbs/branches/datatables/web/systemdefaults.inc.php 2011-08-28 19:27:20 UTC
(rev 1901)
@@ -261,6 +261,10 @@
// in 24 hour format
$twentyfourhour_format = 1;
+// The number of years back and ahead the date selectors should go
+$year_range['back'] = 5;
+$year_range['ahead'] = 5;
+
// Formats used for dates and times. For formatting options
// see http://php.net/manual/function.strftime.php
$strftime_format['date'] = "%A %d %B %Y"; // Used in Day view
Property changes on: mrbs/branches/datatables/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/disabled_rooms/web/upgrade/5/pgsql.sql:1601-1634
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/ics_attachments/web/upgrade/5/pgsql.sql:1652-1741
/mrbs/branches/only_unicode/web/upgrade/5/pgsql.sql:1747-1749
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql:1407-1570
+ /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/disabled_rooms/web/upgrade/5/pgsql.sql:1601-1634
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/ics_attachments/web/upgrade/5/pgsql.sql:1652-1741
/mrbs/branches/only_unicode/web/upgrade/5/pgsql.sql:1747-1749
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql:1407-1570
/mrbs/trunk/web/upgrade/5/pgsql.sql:1863-1900
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management
Up to 160% more powerful than alternatives and 25% more efficient.
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
