← Back to branch summary

~hjarrell555/ubuntu-qa-website/bug_1366581

« back to all changes in this revision

Viewing changes to modules/qatracker/user/qatracker.user.builds.php

  • Committer: nskaggs
  • Date: 2014-11-06 14:53:47 UTC
  • mfrom: (401.2.2 fix-date-filtering)
  • Revision ID: nicholas.skaggs@canonical.com-20141106145347-rsmd6zyoevdho7uj
fix bug 1126449

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/qatracker/user/qatracker.user.builds.php
118
118
        $query->condition('qatracker_build_milestone.status', array(0, 1, 4), "IN");
119
119
    }
120
120
    else {
121
 
        if(array_key_exists("date_from", $_POST) && $_POST['date_from']) {
122
 
            $query->condition('qatracker_build.date', DateTime::createFromFormat('m/d/Y', $_POST['date_from'])->format("Ymd"), ">=");
 
121
        if(array_key_exists('date_from', $_POST) && $_POST['date_from']) {
 
122
            $query->condition('qatracker_build_milestone.date', DateTime::createFromFormat('m/d/Y', $_POST['date_from'])->format('Ymd'), '>=');
 
123
        } else {
 
124
            $date_from = new DateTime();
 
125
            $date_from->sub(new DateInterval('P31D'));
 
126
            $query->condition('qatracker_build_milestone.date', $date_from->format('Ymd'), '>=');
123
127
        }
124
 
        if(array_key_exists("date_to", $_POST) && $_POST['date_to']) {
125
 
            $query->condition('qatracker_build.date', DateTime::createFromFormat('m/d/Y', $_POST['date_to'])->format("Ymd"), "<=");
 
128
        
 
129
        if(array_key_exists('date_to', $_POST) && $_POST['date_to']) {
 
130
            $query->condition('qatracker_build_milestone.date', DateTime::createFromFormat('m/d/Y', $_POST['date_to'])->format('Ymd'), '<=');
 
131
        } else {
 
132
            $date_to = new DateTime();
 
133
            $query->condition('qatracker_build_milestone.date', $date_to->format('Ymd'), '<=');
126
134
        }
127
135
    }
128
136
    $query->condition('qatracker_build_milestone.milestoneid', $milestoneid);