natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the duplication of the date shortcut codes

Browse Source
This commit is contained in:
Simon Holywell
2012-04-26 17:24:06 +01:00
parent d348c45c56
commit 23253fc40e
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/IDF/Views/Issue.php
View File

@@ -474,16 +474,8 @@ class IDF_Views_Issue
'page_title' => $title,
'preview' => $preview,
'issue' => new IDF_Issue(),
'date_today' => date('Y-m-d'),
'date_tomorrow' => date('Y-m-d', strtotime('tomorrow')),
'date_eow' => date('Y-m-d', strtotime('next friday')),
'date_eom' => date('Y-m-d', strtotime('last day of this month')),
'date_2_hours' => date('Y-m-d H:i', strtotime('+2 hours')),
'date_2_days' => date('Y-m-d', strtotime('+2 days')),
'date_1_week' => date('Y-m-d', strtotime('+1 week')),
'date_two_weeks' => date('Y-m-d', strtotime('+2 week')),
'date_one_month' => date('Y-m-d', strtotime('+1 month')),
),
self::getDateShortcuts(),
self::autoCompleteArrays($prj)
);
if ($api == true) return $params;
@@ -720,16 +712,8 @@ class IDF_Views_Issue
'previous_issue_id' => $previous_issue_id,
'next_issue_id' => $next_issue_id,
'related_issues' => $related_issues,
'date_today' => date('Y-m-d'),
'date_tomorrow' => date('Y-m-d', strtotime('tomorrow')),
'date_eow' => date('Y-m-d', strtotime('next friday')),
'date_eom' => date('Y-m-d', strtotime('last day of this month')),
'date_2_hours' => date('Y-m-d H:i', strtotime('+2 hours')),
'date_2_days' => date('Y-m-d', strtotime('+2 days')),
'date_1_week' => date('Y-m-d', strtotime('+1 week')),
'date_two_weeks' => date('Y-m-d', strtotime('+2 week')),
'date_one_month' => date('Y-m-d', strtotime('+1 month')),
),
self::getDateShortcuts(),
$arrays),
$request);
}
@@ -1134,6 +1118,21 @@ class IDF_Views_Issue
$auto['auto_relation_types'] = substr($auto['auto_relation_types'], 0, -2);
return $auto;
}
public static function getDateShortcuts()
{
return array(
'date_today' => date('Y-m-d'),
'date_tomorrow' => date('Y-m-d', strtotime('tomorrow')),
'date_eow' => date('Y-m-d', strtotime('next friday')),
'date_eom' => date('Y-m-d', strtotime('last day of this month')),
'date_2_hours' => date('Y-m-d H:i', strtotime('+2 hours')),
'date_2_days' => date('Y-m-d', strtotime('+2 days')),
'date_1_week' => date('Y-m-d', strtotime('+1 week')),
'date_two_weeks' => date('Y-m-d', strtotime('+2 week')),
'date_one_month' => date('Y-m-d', strtotime('+1 month')),
);
}
}
/**