[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.6-299-gea5421f
Ruslan Zakirov
ruz at bestpractical.com
Wed Dec 1 15:43:05 EST 2010
The branch, 3.9-trunk has been updated
via ea5421f0ec2904312e68114203a732bb57adb591 (commit)
via 7e2c3a72056a867299881ce22d3bc80235bc124a (commit)
via 6b262a9755c5c5a17f7358ee15b94b2b048030ad (commit)
via c8597f32059c3c4aa9dcd2856fcd2bf988813460 (commit)
via 394ef1bcb172de2b74c3ce510b7b8429573f7dfb (commit)
via b6cbef024cff75252421cff946e907ad4d79fff1 (commit)
via 895b24374b4d1b8324d8b07d057f368b119653fa (commit)
via 5e8fedcd0584ccde716525d217b8b6a585dd0ed9 (commit)
via e033426a1d055be0cc4a87ce29c1b5632cd93114 (commit)
via 4dd8fc51489ae81baa7813032ec36854dd18660c (commit)
via d6aeefc02c1741af65effe7c47d185a5d947f327 (commit)
via 022930e7240c8116e49fb14962dbc59f78be3b07 (commit)
via cf6185ea1e9c4f40b4f8d9c9f10810656016b5ba (commit)
via 875a7e15b20df188eb110ee8215e8e8a7886a4f8 (commit)
via 57a87f2f34ae50cda33d0924bb0cc549378486ac (commit)
via c956650023092575295a726fb0237aac507d0180 (commit)
via 9577737d16308e47331bd3bff29207d01b342137 (commit)
via 4e6fb09a48d01818f830d2e344cfeda07f083c8c (commit)
via fbc20bb904d0de51ab1b0e263d1ebd21269c7b41 (commit)
via 6d9d2b0e0576507e761c6e4f235744c6604c33cf (commit)
via 568ebd303f9ed4cdb620b7bb0ef835158beb26cd (commit)
via 7c1bd27fc16c6817b36a076ed7a5910ccd63ab6d (commit)
via 7208c7a2a82798ff903e36a5d7f3675101c6a3d0 (commit)
via 4cdd2d509dd1be789be919ee69d8c4d6008a2e09 (commit)
via 2e62dcb892c095289cb18b37faa30d1756cc36af (commit)
via d8017f6ab0b1feb82c0ac1365fd3ecc915196034 (commit)
via 41d2bb08a21356bef8391e6146ba3ee6541d576e (commit)
via eeff0a2d127f2f5701821fe373bb7a5703da056b (commit)
via 388136418df334bf4eaae6de50115327cc72ad26 (commit)
via cc233ee3b1b219ade558f08d6e37628458bc17cd (commit)
via e56ad7ad7cd6cbdd93686b0bc5b99b5145377be0 (commit)
via 10b68454e380f3a35eb419848de6e995e8751dc9 (commit)
via c6f7c26a57f7642df9890f45f3a6044c0a4bb5a6 (commit)
via e5dc4440fb453f854eefd4600b1d9d12bd9b692f (commit)
via 0a159f4086c4750c4e8f4cdece59502b25b6e469 (commit)
via b13c6ed81e857c750b636ad4d686996a58726aef (commit)
via 8b06287beec52bf0a90aac915b19e841fd574162 (commit)
via fb30567bb73801dcc7dcff46a6b553db2689211a (commit)
via e058a7742ad3e8fdc0b97bb0ae211dbf17e64e95 (commit)
via 263c53eea030f1929f91e479701f8e061176dc07 (commit)
via f2d8c11f1d0d5a1d34e415f94ff9b341c42a6717 (commit)
via 7259c0d3c3a461db136381c0de274f1e5a6a3cac (commit)
via 0dc44e9087ca1216d2e13b509887ff3ef2e2c49f (commit)
via 0b1ba49f99b5b6773f22f6f7f2d35498c957106e (commit)
via 112b00954c892866b07a75abfbab6076649b1a47 (commit)
via 8457bd4d0d6876bd82998f871dc508e63f7b8062 (commit)
via 0ff473d944af99cb92359989708f000a96cd07d1 (commit)
via 25ea5ed0f3aded174f44dee5252bb83fa8e6fbe9 (commit)
via 0bcabe7b03265322313c1257048225bc734ed404 (commit)
via ce4db52390d40ceffa65f073f4e0199947dbc054 (commit)
via ecea142a4f695bf99a14d3af9c508d5590a1db61 (commit)
via 900099bec62fc167062506054bba9a1386ab2da7 (commit)
via cb59cd48a1b87fe5071202f86ef253bd24d15193 (commit)
via 7494a3e1a25b8de6fb92c11712aa05c84dab05d3 (commit)
from b34bc71918e83a8593a73739b1f25ed33b83f794 (commit)
Summary of changes:
etc/RT_Config.pm.in | 108 +++---
etc/schema.Oracle | 1 +
etc/schema.Pg | 1 +
etc/schema.SQLite | 1 +
etc/schema.mysql | 1 +
etc/upgrade/3.9.6/schema.SQLite | 1 -
etc/upgrade/3.9.7/schema.Oracle | 1 +
etc/upgrade/3.9.7/schema.Pg | 1 +
etc/upgrade/3.9.7/schema.SQLite | 1 +
etc/upgrade/3.9.7/schema.mysql | 1 +
lib/RT/Action/AutoOpen.pm | 8 +-
lib/RT/Action/SetStatus.pm | 10 +-
lib/RT/Condition/StatusChange.pm | 8 +-
lib/RT/Lifecycle.pm | 538 +++++++++++----------------
lib/RT/Queue.pm | 22 ++
lib/RT/Queue_Overlay.pm | 73 +++--
lib/RT/Ticket_Overlay.pm | 131 ++-----
share/html/Admin/Queues/Modify.html | 11 +-
share/html/Elements/QueueSummaryByLifecycle | 12 +-
share/html/Elements/QueueSummaryByStatus | 10 +-
share/html/Elements/RT__Queue/ColumnMap | 1 +
share/html/Elements/SelectStatus | 31 +-
share/html/Elements/Tabs | 43 +--
share/html/SelfService/Update.html | 2 +-
share/html/Ticket/Create.html | 4 +-
share/html/Ticket/Elements/EditBasics | 2 +-
share/html/Tools/MyDay.html | 2 +-
share/html/m/ticket/create | 4 +-
share/html/m/ticket/reply | 2 +-
t/lifecycles/basics.t | 48 +++-
t/lifecycles/dates.t | 19 +-
t/lifecycles/moving.t | 3 +-
t/lifecycles/utils.pl | 15 +-
33 files changed, 540 insertions(+), 576 deletions(-)
- Log -----------------------------------------------------------------
commit ea5421f0ec2904312e68114203a732bb57adb591
Merge: b34bc71 7e2c3a7
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Wed Dec 1 23:42:45 2010 +0300
Merge branch '3.9-lifecycles_improvments_v2' into 3.9-trunk
Conflicts:
etc/schema.Oracle
etc/schema.Pg
etc/schema.SQLite
etc/schema.mysql
etc/upgrade/3.9.7/schema.Oracle
etc/upgrade/3.9.7/schema.Pg
etc/upgrade/3.9.7/schema.SQLite
etc/upgrade/3.9.7/schema.mysql
lib/RT/Queue.pm
lib/RT/Queue_Overlay.pm
diff --cc etc/schema.Oracle
index 2384d13,9d3868c..0d6df00
--- a/etc/schema.Oracle
+++ b/etc/schema.Oracle
@@@ -27,7 -27,7 +27,8 @@@ CREATE TABLE Queues
Description VARCHAR2(255),
CorrespondAddress VARCHAR2(120),
CommentAddress VARCHAR2(120),
+ Lifecycle VARCHAR2(32),
+ SubjectTag VARCHAR2(120),
InitialPriority NUMBER(11,0) DEFAULT 0 NOT NULL,
FinalPriority NUMBER(11,0) DEFAULT 0 NOT NULL,
DefaultDueIn NUMBER(11,0) DEFAULT 0 NOT NULL,
diff --cc etc/schema.Pg
index b3c0534,c39adfa..0178521
--- a/etc/schema.Pg
+++ b/etc/schema.Pg
@@@ -50,7 -50,7 +50,8 @@@ CREATE TABLE Queues
Description varchar(255) NULL ,
CorrespondAddress varchar(120) NULL ,
CommentAddress varchar(120) NULL ,
+ Lifecycle varchar(32) NULL,
+ SubjectTag varchar(120) NULL ,
InitialPriority integer NOT NULL DEFAULT 0 ,
FinalPriority integer NOT NULL DEFAULT 0 ,
DefaultDueIn integer NOT NULL DEFAULT 0 ,
diff --cc etc/schema.SQLite
index e31594e,4028248..b5a180f
--- a/etc/schema.SQLite
+++ b/etc/schema.SQLite
@@@ -28,7 -28,7 +28,8 @@@ CREATE TABLE Queues
Description varchar(255) NULL ,
CorrespondAddress varchar(120) NULL ,
CommentAddress varchar(120) NULL ,
+ Lifecycle varchar(32) NULL ,
+ SubjectTag varchar(120) NULL ,
InitialPriority integer NULL ,
FinalPriority integer NULL ,
DefaultDueIn integer NULL ,
diff --cc etc/schema.mysql
index 4814ecb,112382a..09fefa8
--- a/etc/schema.mysql
+++ b/etc/schema.mysql
@@@ -24,7 -24,7 +24,8 @@@ CREATE TABLE Queues
Description varchar(255) NULL ,
CorrespondAddress varchar(120) CHARACTER SET ascii NULL,
CommentAddress varchar(120) CHARACTER SET ascii NULL,
+ Lifecycle varchar(32) CHARACTER SET ascii NULL,
+ SubjectTag varchar(120) NULL,
InitialPriority integer NOT NULL DEFAULT 0 ,
FinalPriority integer NOT NULL DEFAULT 0 ,
DefaultDueIn integer NOT NULL DEFAULT 0 ,
diff --cc etc/upgrade/3.9.7/schema.Oracle
index 6b8adbd,9f9ff3f..a6096e0
--- a/etc/upgrade/3.9.7/schema.Oracle
+++ b/etc/upgrade/3.9.7/schema.Oracle
@@@ -1,5 -1,1 +1,6 @@@
+ALTER TABLE Users ADD COLUMN AuthToken VARCHAR2(16) NULL;
+ALTER TABLE CustomFields ADD COLUMN BasedOn NUMBER(11,0) NULL;
+ALTER TABLE CustomFields ADD COLUMN RenderType VARCHAR2(64) NULL;
+ALTER TABLE CustomFields ADD COLUMN ValuesClass VARCHAR2(64) NULL;
+ALTER TABLE Queues ADD COLUMN SubjectTag VARCHAR2(120) NULL;
+ ALTER TABLE Queues ADD COLUMN Lifecycle VARCHAR2(32) NULL;
diff --cc etc/upgrade/3.9.7/schema.Pg
index 2967aa2,318d3ab..1704fa6
--- a/etc/upgrade/3.9.7/schema.Pg
+++ b/etc/upgrade/3.9.7/schema.Pg
@@@ -1,5 -1,1 +1,6 @@@
+ALTER TABLE Users ADD COLUMN AuthToken VARCHAR(16) NULL;
+ALTER TABLE CustomFields ADD COLUMN BasedOn INTEGER NULL;
+ALTER TABLE CustomFields ADD COLUMN RenderType VARCHAR(64) NULL;
+ALTER TABLE CustomFields ADD COLUMN ValuesClass VARCHAR(64) NULL;
+ALTER TABLE Queues ADD COLUMN SubjectTag VARCHAR(120) NULL;
+ ALTER TABLE Queues ADD COLUMN Lifecycle VARCHAR(32) NULL;
diff --cc etc/upgrade/3.9.7/schema.SQLite
index 2967aa2,318d3ab..1704fa6
--- a/etc/upgrade/3.9.7/schema.SQLite
+++ b/etc/upgrade/3.9.7/schema.SQLite
@@@ -1,5 -1,1 +1,6 @@@
+ALTER TABLE Users ADD COLUMN AuthToken VARCHAR(16) NULL;
+ALTER TABLE CustomFields ADD COLUMN BasedOn INTEGER NULL;
+ALTER TABLE CustomFields ADD COLUMN RenderType VARCHAR(64) NULL;
+ALTER TABLE CustomFields ADD COLUMN ValuesClass VARCHAR(64) NULL;
+ALTER TABLE Queues ADD COLUMN SubjectTag VARCHAR(120) NULL;
+ ALTER TABLE Queues ADD COLUMN Lifecycle VARCHAR(32) NULL;
diff --cc etc/upgrade/3.9.7/schema.mysql
index ccb5ff2,318d3ab..1be1656
--- a/etc/upgrade/3.9.7/schema.mysql
+++ b/etc/upgrade/3.9.7/schema.mysql
@@@ -1,5 -1,1 +1,6 @@@
+ALTER TABLE Users ADD COLUMN AuthToken VARCHAR(16) CHARACTER SET ascii NULL;
+ALTER TABLE CustomFields ADD COLUMN BasedOn INTEGER NULL;
+ALTER TABLE CustomFields ADD COLUMN RenderType VARCHAR(64) NULL;
+ALTER TABLE CustomFields ADD COLUMN ValuesClass VARCHAR(64) CHARACTER SET ascii NULL;
+ALTER TABLE Queues ADD COLUMN SubjectTag VARCHAR(120) NULL;
+ ALTER TABLE Queues ADD COLUMN Lifecycle VARCHAR(32) NULL;
diff --cc lib/RT/Queue.pm
index a2165ff,6b19ef5..74bef45
--- a/lib/RT/Queue.pm
+++ b/lib/RT/Queue.pm
@@@ -90,7 -90,7 +90,8 @@@ Create takes a hash of values and creat
varchar(255) 'Description'.
varchar(120) 'CorrespondAddress'.
varchar(120) 'CommentAddress'.
+ varchar(32) 'Lifecycle'.
+ varchar(120) 'SubjectTag'.
int(11) 'InitialPriority'.
int(11) 'FinalPriority'.
int(11) 'DefaultDueIn'.
@@@ -108,7 -108,7 +109,8 @@@ sub Create
Description => '',
CorrespondAddress => '',
CommentAddress => '',
+ Lifecycle => '',
+ SubjectTag => '',
InitialPriority => '0',
FinalPriority => '0',
DefaultDueIn => '0',
@@@ -120,7 -120,7 +122,8 @@@
Description => $args{'Description'},
CorrespondAddress => $args{'CorrespondAddress'},
CommentAddress => $args{'CommentAddress'},
+ Lifecycle => $args{'Lifecycle'},
+ SubjectTag => $args{'SubjectTag'},
InitialPriority => $args{'InitialPriority'},
FinalPriority => $args{'FinalPriority'},
DefaultDueIn => $args{'DefaultDueIn'},
@@@ -212,23 -212,23 +215,40 @@@ Returns (1, 'Status message') on succes
=cut
+ =head2 Lifecycle
+
+ Returns the current value of Lifecycle.
+ (In the database, Lifecycle is stored as varchar(32).)
+
+
+
+ =head2 SetLifecycle VALUE
+
+
+ Set Lifecycle to VALUE.
+ Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+ (In the database, Lifecycle will be stored as a varchar(32).)
+
+
+ =cut
+
+=head2 SubjectTag
+
+Returns the current value of SubjectTag.
+(In the database, SubjectTag is stored as varchar(120).)
+
+
+
+=head2 SetSubjectTag VALUE
+
+
+Set SubjectTag to VALUE.
+Returns (1, 'Status message') on success and (0, 'Error Message') on failure.
+(In the database, SubjectTag will be stored as a varchar(120).)
+
+
+=cut
+
=head2 InitialPriority
@@@ -352,8 -352,8 +372,10 @@@ sub _CoreAccessible
{read => 1, write => 1, sql_type => 12, length => 120, is_blob => 0, is_numeric => 0, type => 'varchar(120)', default => ''},
CommentAddress =>
{read => 1, write => 1, sql_type => 12, length => 120, is_blob => 0, is_numeric => 0, type => 'varchar(120)', default => ''},
+ SubjectTag =>
+ {read => 1, write => 1, sql_type => 12, length => 120, is_blob => 0, is_numeric => 0, type => 'varchar(120)', default => ''},
+ Lifecycle =>
+ {read => 1, write => 1, sql_type => 12, length => 32, is_blob => 0, is_numeric => 0, type => 'varchar(32)', default => ''},
InitialPriority =>
{read => 1, write => 1, sql_type => 4, length => 11, is_blob => 0, is_numeric => 1, type => 'int(11)', default => '0'},
FinalPriority =>
diff --cc lib/RT/Queue_Overlay.pm
index 5d8619a,2a321da..de155b2
--- a/lib/RT/Queue_Overlay.pm
+++ b/lib/RT/Queue_Overlay.pm
@@@ -362,10 -383,11 +383,11 @@@ sub Create
my $self = shift;
my %args = (
Name => undef,
- CorrespondAddress => '',
Description => '',
+ CorrespondAddress => '',
CommentAddress => '',
+ Lifecycle => 'default',
- SubjectTag => '',
+ SubjectTag => undef,
InitialPriority => 0,
FinalPriority => 0,
DefaultDueIn => 0,
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list