Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '6.0.3' into stable

  • Loading branch information...
commit 048c115ccd1ae96b331beb9a48564d140ba41733 2 parents 8b2e6d9 + be68842
@jstanden jstanden authored
View
1  features/cerberusweb.core/api/dao/ticket.php
@@ -1277,6 +1277,7 @@ private static function _translateVirtualParameters($param, $key, &$args) {
$status_sql = array();
switch($param->operator) {
+ default:
case DevblocksSearchCriteria::OPER_IN:
$oper = '=';
break;
View
4 features/cerberusweb.support_center/api/sc/uri/history.php
@@ -35,7 +35,7 @@ function writeResponse(DevblocksHttpResponse $response) {
$history_view->renderLimit = 10;
$history_view->addParams(array(
- new DevblocksSearchCriteria(SearchFields_Ticket::VIRTUAL_STATUS,null,array('open','waiting')),
+ new DevblocksSearchCriteria(SearchFields_Ticket::VIRTUAL_STATUS,'in',array('open','waiting')),
), true);
}
@@ -420,7 +420,7 @@ function doSetCriteria($field, $oper, $value) {
case SearchFields_Ticket::VIRTUAL_STATUS:
@$statuses = DevblocksPlatform::importGPC($_REQUEST['value'],'array',array());
- $criteria = new DevblocksSearchCriteria($field, null, $statuses);
+ $criteria = new DevblocksSearchCriteria($field, $oper, $statuses);
break;
case SearchFields_Ticket::TICKET_CREATED_DATE:
View
2  features/cerberusweb.support_center/templates/support_center/history/criteria/status.tpl
@@ -1,5 +1,7 @@
<b>{$translate->_('ticket.status')|capitalize}:</b><br>
+<input type="hidden" name="oper" value="in">
+
<label><input name="value[]" type="checkbox" value="waiting"> {$translate->_('status.open')|capitalize}</label>
<label><input name="value[]" type="checkbox" value="open"> {$translate->_('status.waiting')|capitalize}</label>
<label><input name="value[]" type="checkbox" value="closed"> {$translate->_('status.closed')|capitalize}</label>
Please sign in to comment.
Something went wrong with that request. Please try again.