From: unknown Date: Sun, 7 Sep 2014 11:08:52 +0000 (+0100) Subject: Parent /child text on event dashboard X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=30051f5b118ade37145aa2e3b0f5a7f28fbab390;p=civicrm-core.git Parent /child text on event dashboard --- diff --git a/CRM/Core/Form/RecurringEntity.php b/CRM/Core/Form/RecurringEntity.php index 5f8ae2c68f..412cac8fdb 100644 --- a/CRM/Core/Form/RecurringEntity.php +++ b/CRM/Core/Form/RecurringEntity.php @@ -93,7 +93,7 @@ class CRM_Core_Form_RecurringEntity { $form->addFormRule(array('CRM_Core_Form_RecurringEntity', 'formRule')); $form->addDate('repeat_absolute_date', ts('On'), FALSE, array('formatType' => 'mailing')); $form->addDate('exclude_date', ts('Exclude Date(s)'), FALSE); - $select = $form->add('select', 'exclude_date_list', ts(''), $form->_excludeDateInfo, FALSE, array('style' => 'width:200px;', 'size' => 4)); + $select = $form->add('select', 'exclude_date_list', ts(''), $form->_excludeDateInfo, FALSE, array('style' => 'width:150px;', 'size' => 4)); $select->setMultiple(TRUE); $form->addElement('button','add_to_exclude_list','>>','onClick="addToExcludeList(document.getElementById(\'exclude_date\').value);"'); $form->addElement('button','remove_from_exclude_list', '<<', 'onClick="removeFromExcludeList(\'exclude_date_list\')"'); diff --git a/CRM/Event/BAO/Event.php b/CRM/Event/BAO/Event.php index a941e2b1ea..e56c286297 100644 --- a/CRM/Event/BAO/Event.php +++ b/CRM/Event/BAO/Event.php @@ -404,7 +404,7 @@ SELECT civicrm_event.id as id, civicrm_event.title as event_title, civicrm_e civicrm_event.slot_label_id, civicrm_event.summary as summary, civicrm_pcp_block.id as is_pcp_enabled, - civicrm_recurring_entity.id as is_repeating_event + civicrm_recurring_entity.parent_id as is_repeating_event FROM civicrm_event LEFT JOIN civicrm_option_value ON ( civicrm_event.event_type_id = civicrm_option_value.value AND diff --git a/templates/CRM/Event/Page/DashBoard.tpl b/templates/CRM/Event/Page/DashBoard.tpl index 8ed876fb7b..3245caba67 100644 --- a/templates/CRM/Event/Page/DashBoard.tpl +++ b/templates/CRM/Event/Page/DashBoard.tpl @@ -57,7 +57,16 @@ {foreach from=$eventSummary.events item=values key=id} - {$values.eventTitle} + {$values.eventTitle} + {if $values.is_repeating_event} +
+ {if $values.is_repeating_event eq $id} + Repeating Event - (Parent) + {else} + Repeating Event - (Child) + {/if} + {/if} + {$id} {$values.eventType} {$values.isPublic}