Revision: 2127
http://mrbs.svn.sourceforge.net/mrbs/?rev=2127&view=rev
Author: cimorrison
Date: 2011-10-20 10:46:08 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
Stopped non-admins dragging existing bookings across multiple rooms when
they're not allowed to
Modified Paths:
--------------
mrbs/branches/draggable_bookings/web/Themes/default/header.inc
Modified: mrbs/branches/draggable_bookings/web/Themes/default/header.inc
===================================================================
--- mrbs/branches/draggable_bookings/web/Themes/default/header.inc
2011-10-20 10:17:49 UTC (rev 2126)
+++ mrbs/branches/draggable_bookings/web/Themes/default/header.inc
2011-10-20 10:46:08 UTC (rev 2127)
@@ -1702,6 +1702,7 @@
return;
};
+
<?php
// Turn all the empty cells where a new multi-cell selection
// can be created by dragging the mouse
@@ -2034,25 +2035,18 @@
var handles = 'all';
<?php
- if ($page == 'week')
+ if (!$is_admin)
{
- // If we're in the week view then if non-admins aren't allowed
to
- // make repeat bookings then we want to restrict the handles we
- // offer them so that they can't get that far.
- if (!$is_admin && $auth['only_admin_can_book_repeat'])
+ if ((($page == 'week') && $auth['only_admin_can_book_repeat'])
||
+ (($page == 'day') &&
$auth['only_admin_can_select_multiroom']))
{
- if ($times_along_top)
- {
- ?>
- handles = 'e, w';
- <?php
- }
- else
- {
- ?>
- handles = 'n, s';
- <?php
- }
+ // If we're in the week view then if non-admins aren't
allowed to
+ // make repeat bookings, or else if we're in the day view
and they
+ // aren't allowed to select multiple rooms, then we want to
restrict
+ // the handles we offer them so that they can't get that far.
+ ?>
+ handles = '<?php echo ($times_along_top) ? "e,w" : "n,s" ?>';
+ <?php
}
}
?>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Ciosco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
