manuelcillero/suitedesk
manuelcillero/suitedesk
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Solved visualization problem with events and shorted 'Change date' button label

Browse source
This commit is contained in:
Manuel Cillero 2017-07-26 20:22:46 +02:00
parent 7abff11841
commit defad8cdef
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sites/all/modules/calendar/calendar.module
View file

@ -383,7 +383,7 @@ function calendar_date_select_form(&$form_state, $view) {
); );
$form['submit'] = array( $form['submit'] = array(
'#type' => 'submit', '#type' => 'submit',
'#value' => t('Change date'), '#value' => t('Go'),
); );
return $form; return $form;
} }
@ -873,16 +873,16 @@ function calendar_build_nodes(&$view, &$items) {
$node->calendar_start = date_format($node->calendar_start_date, DATE_FORMAT_DATETIME); $node->calendar_start = date_format($node->calendar_start_date, DATE_FORMAT_DATETIME);
$node->calendar_end = date_format($node->calendar_end_date, DATE_FORMAT_DATETIME); $node->calendar_end = date_format($node->calendar_end_date, DATE_FORMAT_DATETIME);
if (substr($real_field, 0, 9) == 'field_') { if (substr($real_field, 0, 6) == 'field_') {
$cck_field = content_fields($cck_field_name); $cck_field = content_fields($cck_field_name);
$granularity = $cck_field['granularity']; $granularity = is_array($cck_field['granularity']) ? end($cck_field['granularity']) : $cck_field['granularity'];
$increment = $cck_field['widget']['increment']; $increment = $cck_field['widget']['increment'];
} }
else { else {
$granularity = 'second'; $granularity = 'second';
$increment = 1; $increment = 1;
} }
$node->calendar_all_day = date_is_all_day($node->calendar_end, $node->calendar_end, $granularity, $increment); $node->calendar_all_day = $granularity == 'day' ? TRUE : date_is_all_day($node->calendar_start, $node->calendar_end, $granularity, $increment);
// Flag all day values specifically set in date. // Flag all day values specifically set in date.
$all_day_field = str_replace(array('_value2', '_value'), '_all_day', $node->datefield); $all_day_field = str_replace(array('_value2', '_value'), '_all_day', $node->datefield);
@ -918,4 +918,4 @@ function calendar_build_nodes(&$view, &$items) {
} }
} }
return $nodes; return $nodes;
} }