Skip to content

Issue774 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pjohans wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Issue774 #10

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc88023
Issue 774 by Pjohans: Add creator and materialtype to reservation-list
pjohans Aug 18, 2015
c435d3b
Revert "Issue 774 by Pjohans: Add creator and materialtype to reserva…
pjohans Aug 18, 2015
94385f3
Issue 774 by Pjohans: Add creator and materialtype to reservation-list
pjohans Aug 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions ding_reservation.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,12 +485,34 @@ function ding_reservation_reservations_form($form, &$form_state, $reservations,
$title = l($entity->getTitle(), $uri['path']);
}

// Add creator(s).
$creators = $entity->creators;
if(!is_array($creators)){
$creators = array($creators);
}

$creator_string = '';
if(!empty($creators)) {
foreach ($creators as $creator) {
if (!empty($creator_string)) {
$creator_string .= ', ';
}
$creator_string .= $creator;
}
$creator_string .= ' :';
}

// Add type.
$mat_type = $entity->type;

$pickup_branch = ding_provider_invoke('reservation', 'branch_name', $reservation->pickup_branch_id);
switch ($reservation->reservation_type) {
case DING_RESERVATION_READY:
$item = array(
'#type' => 'material_item',
'#id' => $reservation->id,
'#creators' => $creator_string,
'#material_type' => $mat_type,
'#title' => $title,
'#cover' => field_view_field('ting_object', $entity, 'ting_cover', 'user_list'),
'#information' => array(
Expand Down Expand Up @@ -526,6 +548,8 @@ function ding_reservation_reservations_form($form, &$form_state, $reservations,
$item = array(
'#type' => 'material_item',
'#id' => $reservation->id,
'#creators' => $creator_string,
'#material_type' => $mat_type,
'#title' => $title,
'#cover' => field_view_field('ting_object', $entity, 'ting_cover', 'user_list'),
'#information' => array(
Expand Down Expand Up @@ -567,6 +591,8 @@ function ding_reservation_reservations_form($form, &$form_state, $reservations,
$item = array(
'#type' => 'material_item',
'#id' => $reservation->id,
'#creators' => $creator_string,
'#material_type' => $mat_type,
'#title' => $title,
'#cover' => field_view_field('ting_object', $entity, 'ting_cover', 'user_list'),
'#information' => array(
Expand Down