Skip to content
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

Jump to bottom

fix: empty birthday was forced to save zero date #1787

Merged
merged 9 commits into from
Mar 28, 2017
Merged

fix: empty birthday was forced to save zero date #1787

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
828853a
fix: empty birthday was forced to save zero date
jaanusnurmoja Sep 28, 2016
321bcce
making this fix simpler
jaanusnurmoja Mar 28, 2017
a87e497
updated comment
jaanusnurmoja Mar 28, 2017
0fd0f8e
empty values were disabled in d m y dropdowns
jaanusnurmoja Mar 28, 2017
fb11a1b
changes should be made in birthday.php instead
jaanusnurmoja Mar 28, 2017
c0f3fc6
Merge branch 'master' of https://github.com/Fabrik/fabrik into patch-56
jaanusnurmoja Mar 28, 2017
98ce400
Better fixes for fprced zero values and disabled "first" values
jaanusnurmoja Mar 28, 2017
63bcacf
Merge branch 'patch-56' of https://github.com/jaanusnurmoja/fabrik in…
jaanusnurmoja Mar 28, 2017
918f981
Modified comment
jaanusnurmoja Mar 28, 2017
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
16 changes: 7 additions & 9 deletions plugins/fabrik_element/birthday/birthday.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ private function _dayOptions()
FText::_($params->get('birthday_daylabel', 'PLG_ELEMENT_BIRTHDAY_DAY')),
'value',
'text',
true
false
)
);

Expand All @@ -329,7 +329,7 @@ private function _monthOptions()
FText::_($params->get('birthday_monthlabel', 'PLG_ELEMENT_BIRTHDAY_MONTH')),
'value',
'text',
true
false
)
);
$monthLabels = $this->_monthLabels();
Expand Down Expand Up @@ -357,7 +357,7 @@ private function _yearOptions()
FText::_($params->get('birthday_yearlabel', 'PLG_ELEMENT_BIRTHDAY_YEAR')),
'value',
'text',
true
false
)
);
// Jaanus: now we can choose one exact year A.C to begin the dropdown AND would the latest year be current year or some years earlier/later.
Expand Down Expand Up @@ -400,9 +400,11 @@ public function storeDatabaseFormat($val, $data)
* @TODO: if NULL value is the first in repeated group then in list view whole group is empty.
* Could anyone find a solution? I give up :-(
* Paul 20130904 I fixed the id fields and I am getting a string passed in as $val here yyyy-m-d.
* Jaanus: saved data could be date or nothing (null). Previous return '' wrote always '0000-00-00' as DATE field doesn't know ''.
* such value as '' and therefore setting element to save null hadn't expected impact. Simple return; returns null as it should.
*
*
* @return string yyyy-mm-dd
* @return string yyyy-mm-dd or null or 0000-00-00 if needed and set
*/

private function _indStoreDBFormat($val)
Expand All @@ -424,7 +426,7 @@ private function _indStoreDBFormat($val)
}
}

return '';
return;
}

/**
Expand Down Expand Up @@ -869,10 +871,6 @@ public function getFilterQuery($key, $condition, $value, $originalValue, $type =
case 'laterthisyear':
throw new UnexpectedValueException('The birthday element can not deal with "Later This Year" prefilters');
break;
case 'thisyear':
$search = array(date('Y'), '', '');
return $this->_dayMonthYearFilterQuery($key, $search);
break;
case 'today':
$search = array(date('Y'), date('n'), date('j'));
return $this->_dayMonthYearFilterQuery($key, $search);
Expand Down