User: darrick Branch: DRUPAL-6--2 Date: Tue, 25 Jan 2011 21:52:18 +0000 Modified files: /modules/merci/handlers merci_handler_field.inc merci_handler_filter_in_operator.inc /modules/merci/includes menu.inc /modules/merci merci.install merci.module merci.views.inc merci.views_default.inc Log message: * Added view merci_reservable_items which shows resevable items optionally filtered by Checked Out status or Default booking availability. For use with admin/merci/manage/current_inventory page. * Started the process of moving the admin/merci/manage/current_inventory to a theme function. * Modified admin/merci/manage/current_inventory to link to the new merci_reservable_items. * Added operations to admin/merci/manage/current_inventory to add new items, add new merci types or edit type. * Removed views handlers for Default booking availability -- resource, Default booking availability -- bucket, Sub type -- bucket and Sub type -- resource. Migrate these to the handler noted below. * Added views handlers for Default booking availability and Sub type. So same handler field/filter for either bucket or resource items. * Added relationship for getting the reservation nid for a given item_nid (Reservation nid (for item nid)). * Removed INNER JOIN designation for the views handlers. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/merci/handlers/mer... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/handlers/mer... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/includes/men... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/merci.instal... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/merci.module... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/merci.views.... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/merci.views_...