From ca7cc8d36aadfc916bfb7143136c5fed0bdfdc99 Mon Sep 17 00:00:00 2001 From: Jared Hancock <jared@osticket.com> Date: Sun, 15 Nov 2015 22:01:34 -0600 Subject: [PATCH] queue: Add upgrade path from v1.10 And, fix bad width on new open queue And, fix bad criteria on install --- include/i18n/en_US/queue.yaml | 6 ++--- include/upgrader/streams/core.sig | 2 +- ....patch.sql => 98ad7d55-934b8db8.patch.sql} | 4 ++-- .../streams/core/98ad7d55-934b8db8.task.php | 22 +++++++++++++++++++ 4 files changed, 28 insertions(+), 6 deletions(-) rename include/upgrader/streams/core/{98ad7d55-00000000.patch.sql => 98ad7d55-934b8db8.patch.sql} (93%) create mode 100644 include/upgrader/streams/core/98ad7d55-934b8db8.task.php diff --git a/include/i18n/en_US/queue.yaml b/include/i18n/en_US/queue.yaml index 19c096d20..4d01f5fbb 100644 --- a/include/i18n/en_US/queue.yaml +++ b/include/i18n/en_US/queue.yaml @@ -36,7 +36,7 @@ columns: - column_id: 1 sort: 1 - width: 75 + width: 100 heading: Ticket - column_id: 10 sort: 2 @@ -96,7 +96,7 @@ flags: 0x0b root: T sort: 1 - config: '[["status__state","includes",{"open":"Open"}],["answered","nset",null]]' + config: '[["isanswered","nset",null]]' columns: - column_id: 1 sort: 1 @@ -128,7 +128,7 @@ flags: 0x0b root: T sort: 2 - config: '[["assignee","unassigned",null]]' + config: '[["assignee","!assigned",null]]' columns: - column_id: 1 sort: 1 diff --git a/include/upgrader/streams/core.sig b/include/upgrader/streams/core.sig index f6aa807b2..5c87bd1bf 100644 --- a/include/upgrader/streams/core.sig +++ b/include/upgrader/streams/core.sig @@ -1 +1 @@ -98ad7d550c26ac44340350912296e673 +934b8db8f97d6859d013b6219957724f diff --git a/include/upgrader/streams/core/98ad7d55-00000000.patch.sql b/include/upgrader/streams/core/98ad7d55-934b8db8.patch.sql similarity index 93% rename from include/upgrader/streams/core/98ad7d55-00000000.patch.sql rename to include/upgrader/streams/core/98ad7d55-934b8db8.patch.sql index bc3ca35cd..7ebe9a816 100644 --- a/include/upgrader/streams/core/98ad7d55-00000000.patch.sql +++ b/include/upgrader/streams/core/98ad7d55-934b8db8.patch.sql @@ -1,6 +1,6 @@ /** * @version v1.11 - * @signature 00000000000000000000000000000000 + * @signature 934b8db8f97d6859d013b6219957724f * @title Custom Queues, Columns * * Add custom queues, custom columns, and quick filter capabilities to the @@ -41,5 +41,5 @@ CREATE TABLE `%TABLE_PREFIX%queue_columns` ( -- Finished with patch UPDATE `%TABLE_PREFIX%config` - SET `value` = '00000000000000000000000000000000' + SET `value` = '934b8db8f97d6859d013b6219957724f' WHERE `key` = 'schema_signature' AND `namespace` = 'core'; diff --git a/include/upgrader/streams/core/98ad7d55-934b8db8.task.php b/include/upgrader/streams/core/98ad7d55-934b8db8.task.php new file mode 100644 index 000000000..66720d3c6 --- /dev/null +++ b/include/upgrader/streams/core/98ad7d55-934b8db8.task.php @@ -0,0 +1,22 @@ +<?php + +class QueueCreator extends MigrationTask { + var $description = "Load customziable ticket queues"; + + function run($time) { + $i18n = new Internationalization('en_US'); + $columns = $i18n->getTemplate('queue_column.yaml')->getData(); + foreach ($columns as $C) { + QueueColumn::__create($C); + } + $queues = $i18n->getTemplate('queue.yaml')->getData(); + foreach ($queues as $C) { + CustomQueue::__create($C); + } + + // Set default queue to 'open' + global $cfg; + $cfg->set('default_ticket_queue', 1); + } +} +return 'QueueCreator'; -- GitLab