User: darrick Branch: DRUPAL-6--2 Date: Thu, 24 Feb 2011 03:53:30 +0000 Modified files: /modules/merci/includes menu.inc /modules/merci merci.module /modules/merci/modules/merci_permissions merci_permissions.module /modules/merci/modules/merci_printable_contract merci-printable-contract.tpl.php /modules/merci/modules/merci_staff merci_staff.module /modules/merci/tests merci.test /modules/merci/theme theme.inc Log message: Moved node->reservation_items to node->merci_reservation_items. Moved form['existing_items'] to from['merci_reservation_items']. Moved form['choices'] to form['merci_reservation_items']. Removed drupal_access_denied() from the validation functions for deleting types and items. Changed to just removing the Delete submit on the confirm buttons. The choice select box is now part of the reservation_table_form instead of seperated out. Got rid of merci/datefilter menu callback as merci/js callback is exactly the same. Removed mercistaff/js and mercistaff/datefilter as the merci/js callback does the same. Added merci_ahah_get_form to help with the ahah callback functions. Since the form fields now match the node fields all the ahah callbacks are done properly as in they rebuild and cache the entire form and then return the requested element for rendering. Changed permission for merci_staff from adminster MERCI or manage MERCI to just manage reservations. Added regression test for issue #1070662. Also fixed the issue. Added regression test for issue #1070658. Also fixed the issue. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/merci/includes/men... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/merci.module... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/modules/merc... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/modules/merc... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/modules/merc... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/tests/merci.... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/theme/theme....