Skip to content
Snippets Groups Projects
Commit 8ed92f3d authored by Jared Hancock's avatar Jared Hancock Committed by Peter Rotich
Browse files

queue: Shore up the installer

parent c1ed5100
Branches
Tags
No related merge requests found
...@@ -207,7 +207,7 @@ class Bootstrap { ...@@ -207,7 +207,7 @@ class Bootstrap {
require(INCLUDE_DIR.'class.mailer.php'); require(INCLUDE_DIR.'class.mailer.php');
require_once INCLUDE_DIR.'mysqli.php'; require_once INCLUDE_DIR.'mysqli.php';
require_once INCLUDE_DIR.'class.i18n.php'; require_once INCLUDE_DIR.'class.i18n.php';
require_once INCLUDE_DIR.'class.search.php'; require_once INCLUDE_DIR.'class.queue.php';
} }
function i18n_prep() { function i18n_prep() {
......
...@@ -19,7 +19,6 @@ if(!defined('INCLUDE_DIR')) die('403'); ...@@ -19,7 +19,6 @@ if(!defined('INCLUDE_DIR')) die('403');
include_once(INCLUDE_DIR.'class.ticket.php'); include_once(INCLUDE_DIR.'class.ticket.php');
require_once(INCLUDE_DIR.'class.ajax.php'); require_once(INCLUDE_DIR.'class.ajax.php');
require_once(INCLUDE_DIR.'class.queue.php');
class SearchAjaxAPI extends AjaxController { class SearchAjaxAPI extends AjaxController {
......
...@@ -1241,7 +1241,6 @@ class OsticketConfig extends Config { ...@@ -1241,7 +1241,6 @@ class OsticketConfig extends Config {
if (!preg_match('`(?!<\\\)#`', $vars['ticket_number_format'])) if (!preg_match('`(?!<\\\)#`', $vars['ticket_number_format']))
$errors['ticket_number_format'] = 'Ticket number format requires at least one hash character (#)'; $errors['ticket_number_format'] = 'Ticket number format requires at least one hash character (#)';
require_once INCLUDE_DIR . 'class.queue.php';
if (!isset($vars['default_ticket_queue'])) if (!isset($vars['default_ticket_queue']))
$errors['default_ticket_queue'] = __("Select a default ticket queue"); $errors['default_ticket_queue'] = __("Select a default ticket queue");
elseif (!CustomQueue::lookup($vars['default_ticket_queue'])) elseif (!CustomQueue::lookup($vars['default_ticket_queue']))
......
...@@ -66,6 +66,7 @@ class Internationalization { ...@@ -66,6 +66,7 @@ class Internationalization {
'role.yaml' => 'Role::__create', 'role.yaml' => 'Role::__create',
'file.yaml' => 'AttachmentFile::__create', 'file.yaml' => 'AttachmentFile::__create',
'sequence.yaml' => 'Sequence::__create', 'sequence.yaml' => 'Sequence::__create',
'queue.yaml' => 'CustomQueue::__create',
); );
$errors = array(); $errors = array();
......
...@@ -290,6 +290,12 @@ class CustomQueue extends SavedSearch { ...@@ -290,6 +290,12 @@ class CustomQueue extends SavedSearch {
return $queue; return $queue;
} }
static function __create($vars) {
$q = static::create($vars);
$q->save();
return $q;
}
} }
abstract class QueueColumnAnnotation { abstract class QueueColumnAnnotation {
......
...@@ -80,3 +80,4 @@ core: ...@@ -80,3 +80,4 @@ core:
log_level: 2 log_level: 2
log_graceperiod: 12 log_graceperiod: 12
client_registration: 'public' client_registration: 'public'
default_ticket_queue: 1
<?php
require_once INCLUDE_DIR . 'class.queue.php';
?>
<div> <div>
<table class="form_table settings_table" width="940" border="0" cellspacing="0" cellpadding="2"> <table class="form_table settings_table" width="940" border="0" cellspacing="0" cellpadding="2">
<thead> <thead>
......
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
require('admin.inc.php'); require('admin.inc.php');
require_once INCLUDE_DIR . 'class.queue.php';
$nav->setTabActive('settings', 'settings.php?t='.urlencode($_GET['t'])); $nav->setTabActive('settings', 'settings.php?t='.urlencode($_GET['t']));
$errors = array(); $errors = array();
......
...@@ -58,7 +58,6 @@ if (!$ticket) { ...@@ -58,7 +58,6 @@ if (!$ticket) {
$_GET['status'] = $_REQUEST['status'] = $queue_name; $_GET['status'] = $_REQUEST['status'] = $queue_name;
} }
require_once INCLUDE_DIR . 'class.queue.php';
$queue_id = @$_REQUEST['queue'] ?: $cfg->getDefaultTicketQueueId(); $queue_id = @$_REQUEST['queue'] ?: $cfg->getDefaultTicketQueueId();
if ((int) $queue_id) { if ((int) $queue_id) {
$queue = CustomQueue::lookup($queue_id); $queue = CustomQueue::lookup($queue_id);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment