From bc88023b6c20bd22131b2b8957f40c03fa0d6d51 Mon Sep 17 00:00:00 2001 From: pjohans Date: Tue, 18 Aug 2015 14:08:55 +0200 Subject: [PATCH 1/3] Issue 774 by Pjohans: Add creator and materialtype to reservation-list --- ding_reservation.module | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/ding_reservation.module b/ding_reservation.module index 142920c..1aff43c 100644 --- a/ding_reservation.module +++ b/ding_reservation.module @@ -485,11 +485,33 @@ 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', + '#creators' => $creator_string, + '#material_type' => $mat_type, '#id' => $reservation->id, '#title' => $title, '#cover' => field_view_field('ting_object', $entity, 'ting_cover', 'user_list'), @@ -525,6 +547,8 @@ function ding_reservation_reservations_form($form, &$form_state, $reservations, case DING_RESERVATION_NOT_READY: $item = array( '#type' => 'material_item', + '#creators' => $creator_string, + '#material_type' => $mat_type, '#id' => $reservation->id, '#title' => $title, '#cover' => field_view_field('ting_object', $entity, 'ting_cover', 'user_list'), @@ -566,6 +590,8 @@ function ding_reservation_reservations_form($form, &$form_state, $reservations, case DING_RESERVATION_INTERLIBRARY_LOANS: $item = array( '#type' => 'material_item', + '#creators' => $creator_string, + '#material_type' => $mat_type, '#id' => $reservation->id, '#title' => $title, '#cover' => field_view_field('ting_object', $entity, 'ting_cover', 'user_list'), From c435d3b509aee4596d0bd77ef6f1e5ac0c4142e3 Mon Sep 17 00:00:00 2001 From: pjohans Date: Tue, 18 Aug 2015 14:09:39 +0200 Subject: [PATCH 2/3] Revert "Issue 774 by Pjohans: Add creator and materialtype to reservation-list" This reverts commit bc88023b6c20bd22131b2b8957f40c03fa0d6d51. --- ding_reservation.module | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/ding_reservation.module b/ding_reservation.module index 1aff43c..142920c 100644 --- a/ding_reservation.module +++ b/ding_reservation.module @@ -485,33 +485,11 @@ 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', - '#creators' => $creator_string, - '#material_type' => $mat_type, '#id' => $reservation->id, '#title' => $title, '#cover' => field_view_field('ting_object', $entity, 'ting_cover', 'user_list'), @@ -547,8 +525,6 @@ function ding_reservation_reservations_form($form, &$form_state, $reservations, case DING_RESERVATION_NOT_READY: $item = array( '#type' => 'material_item', - '#creators' => $creator_string, - '#material_type' => $mat_type, '#id' => $reservation->id, '#title' => $title, '#cover' => field_view_field('ting_object', $entity, 'ting_cover', 'user_list'), @@ -590,8 +566,6 @@ function ding_reservation_reservations_form($form, &$form_state, $reservations, case DING_RESERVATION_INTERLIBRARY_LOANS: $item = array( '#type' => 'material_item', - '#creators' => $creator_string, - '#material_type' => $mat_type, '#id' => $reservation->id, '#title' => $title, '#cover' => field_view_field('ting_object', $entity, 'ting_cover', 'user_list'), From 94385f397a87e495c5bb871fa261edaa46c6b9ef Mon Sep 17 00:00:00 2001 From: pjohans Date: Tue, 18 Aug 2015 14:12:05 +0200 Subject: [PATCH 3/3] Issue 774 by Pjohans: Add creator and materialtype to reservation-list --- ding_reservation.module | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/ding_reservation.module b/ding_reservation.module index 142920c..970853d 100644 --- a/ding_reservation.module +++ b/ding_reservation.module @@ -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( @@ -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( @@ -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(