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

Hotfix date filter #167

Merged
merged 2 commits into from
Aug 3, 2016
Merged

Hotfix date filter #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34a470c
Fix edited_date_to filter
JimBacon Aug 3, 2016
efe08ee
Bump version
JimBacon Aug 3, 2016
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
4 changes: 2 additions & 2 deletions application/config/version.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
/**
* @var string The application files version number.
*/
$config['version'] = '1.2.4';
$config['release_date'] = '2016-07-31';
$config['version'] = '1.2.5';
$config['release_date'] = '2016-08-03';
$config['repository'] = 'https://github.com/Indicia-Team/warehouse/releases';

?>
2 changes: 1 addition & 1 deletion application/helpers/report_standard_params_occurrences.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public static function getParameters() {
'description'=>'Last update date of last record to include in the output',
'wheres' => array(
array('value'=>'', 'operator'=>'',
'sql'=>"('#edited_date_to#'='Click here' OR (o.updated_on <= '#edited_date_to#'::timestamp OR (length('#edited_date_to#')<=10 AND o.updated_on < cast('#input_date_to#' as date) + '1 day'::interval)))")
'sql'=>"('#edited_date_to#'='Click here' OR (o.updated_on <= '#edited_date_to#'::timestamp OR (length('#edited_date_to#')<=10 AND o.updated_on < cast('#edited_date_to#' as date) + '1 day'::interval)))")
)
),
'edited_date_age' => array('datatype'=>'text', 'default'=>'', 'display'=>'Last update date from time ago',
Expand Down