[Rt-commit] r10545 - in rt/branches/3.999-DANGEROUS: . docs/design_docs etc etc/upgrade/3.1.0 etc/upgrade/3.3.0 html/Admin/CustomFields html/Admin/Elements html/Admin/Global html/Admin/Groups html/Admin/Queues html/Admin/Users html/Download/CustomFieldValue html/Download/Tabular html/Elements html/Prefs html/REST/1.0/Forms/ticket html/Search html/Ticket html/Ticket/Attachment html/Ticket/Attachment/WithHeaders html/Ticket/Elements html/User html/User/Groups lib/RT lib/RT/Interface lib/RT/Interface/Email/Auth lib/RT/Model lib/RT/ScripAction share/po t t/mail t/ticket t/web
jesse at bestpractical.com
jesse at bestpractical.com
Mon Jan 28 22:52:22 EST 2008
Author: jesse
Date: Mon Jan 28 22:52:22 2008
New Revision: 10545
Modified:
rt/branches/3.999-DANGEROUS/ (props changed)
rt/branches/3.999-DANGEROUS/docs/design_docs/3.3-schema-redesign.txt
rt/branches/3.999-DANGEROUS/etc/initialdata
rt/branches/3.999-DANGEROUS/etc/schema.Informix
rt/branches/3.999-DANGEROUS/etc/schema.Oracle
rt/branches/3.999-DANGEROUS/etc/schema.Pg
rt/branches/3.999-DANGEROUS/etc/schema.SQLite
rt/branches/3.999-DANGEROUS/etc/schema.Sybase
rt/branches/3.999-DANGEROUS/etc/schema.mysql
rt/branches/3.999-DANGEROUS/etc/upgrade/3.1.0/schema.Informix
rt/branches/3.999-DANGEROUS/etc/upgrade/3.1.0/schema.Oracle
rt/branches/3.999-DANGEROUS/etc/upgrade/3.1.0/schema.Pg
rt/branches/3.999-DANGEROUS/etc/upgrade/3.1.0/schema.SQLite
rt/branches/3.999-DANGEROUS/etc/upgrade/3.1.0/schema.mysql
rt/branches/3.999-DANGEROUS/etc/upgrade/3.3.0/schema.Oracle
rt/branches/3.999-DANGEROUS/etc/upgrade/3.3.0/schema.Pg
rt/branches/3.999-DANGEROUS/etc/upgrade/3.3.0/schema.mysql
rt/branches/3.999-DANGEROUS/html/Admin/CustomFields/Objects.html
rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditCustomField
rt/branches/3.999-DANGEROUS/html/Admin/Elements/ObjectCustomFields
rt/branches/3.999-DANGEROUS/html/Admin/Global/Template.html
rt/branches/3.999-DANGEROUS/html/Admin/Groups/GroupRights.html
rt/branches/3.999-DANGEROUS/html/Admin/Groups/History.html
rt/branches/3.999-DANGEROUS/html/Admin/Groups/Members.html
rt/branches/3.999-DANGEROUS/html/Admin/Groups/Modify.html
rt/branches/3.999-DANGEROUS/html/Admin/Groups/UserRights.html
rt/branches/3.999-DANGEROUS/html/Admin/Queues/CustomField.html
rt/branches/3.999-DANGEROUS/html/Admin/Queues/CustomFields.html
rt/branches/3.999-DANGEROUS/html/Admin/Queues/GroupRights.html
rt/branches/3.999-DANGEROUS/html/Admin/Queues/Modify.html
rt/branches/3.999-DANGEROUS/html/Admin/Queues/People.html
rt/branches/3.999-DANGEROUS/html/Admin/Queues/Scrip.html
rt/branches/3.999-DANGEROUS/html/Admin/Queues/Scrips.html
rt/branches/3.999-DANGEROUS/html/Admin/Queues/Template.html
rt/branches/3.999-DANGEROUS/html/Admin/Queues/Templates.html
rt/branches/3.999-DANGEROUS/html/Admin/Queues/UserRights.html
rt/branches/3.999-DANGEROUS/html/Admin/Tools/Configuration.html
rt/branches/3.999-DANGEROUS/html/Admin/Users/CustomFields.html
rt/branches/3.999-DANGEROUS/html/Admin/Users/GnuPG.html
rt/branches/3.999-DANGEROUS/html/Admin/Users/History.html
rt/branches/3.999-DANGEROUS/html/Admin/Users/Memberships.html
rt/branches/3.999-DANGEROUS/html/Admin/Users/Modify.html
rt/branches/3.999-DANGEROUS/html/Admin/Users/MyRT.html
rt/branches/3.999-DANGEROUS/html/Download/CustomFieldValue/dhandler
rt/branches/3.999-DANGEROUS/html/Download/Tabular/dhandler
rt/branches/3.999-DANGEROUS/html/Elements/EditCustomField
rt/branches/3.999-DANGEROUS/html/Elements/SelectAttachmentField
rt/branches/3.999-DANGEROUS/html/Prefs/Search.html
rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/attachments
rt/branches/3.999-DANGEROUS/html/Search/Bulk.html
rt/branches/3.999-DANGEROUS/html/Ticket/Attachment/WithHeaders/dhandler
rt/branches/3.999-DANGEROUS/html/Ticket/Attachment/dhandler
rt/branches/3.999-DANGEROUS/html/Ticket/Create.html
rt/branches/3.999-DANGEROUS/html/Ticket/Display.html
rt/branches/3.999-DANGEROUS/html/Ticket/Elements/FindAttachments
rt/branches/3.999-DANGEROUS/html/Ticket/Elements/LoadTextAttachments
rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowTransaction
rt/branches/3.999-DANGEROUS/html/Ticket/Forward.html
rt/branches/3.999-DANGEROUS/html/Ticket/GnuPG.html
rt/branches/3.999-DANGEROUS/html/Ticket/History.html
rt/branches/3.999-DANGEROUS/html/Ticket/Modify.html
rt/branches/3.999-DANGEROUS/html/Ticket/ModifyAll.html
rt/branches/3.999-DANGEROUS/html/Ticket/ShowEmailRecord.html
rt/branches/3.999-DANGEROUS/html/User/Groups/Members.html
rt/branches/3.999-DANGEROUS/html/User/Groups/Modify.html
rt/branches/3.999-DANGEROUS/html/User/Prefs.html
rt/branches/3.999-DANGEROUS/lib/RT/I18N.pm
rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email/Auth/GnuPG.pm
rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/AttachmentCollection.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomField.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/Link.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/ObjectCustomFieldValue.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/Scrip.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/ScripAction.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/ScripCondition.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/TicketCollection.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm
rt/branches/3.999-DANGEROUS/lib/RT/Record.pm
rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/CreateTickets.pm
rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm
rt/branches/3.999-DANGEROUS/share/po/cs.po
rt/branches/3.999-DANGEROUS/share/po/da.po
rt/branches/3.999-DANGEROUS/share/po/es.po
rt/branches/3.999-DANGEROUS/share/po/fi.po
rt/branches/3.999-DANGEROUS/share/po/id.po
rt/branches/3.999-DANGEROUS/share/po/it.po
rt/branches/3.999-DANGEROUS/share/po/ja.po
rt/branches/3.999-DANGEROUS/share/po/nl.po
rt/branches/3.999-DANGEROUS/share/po/no.po
rt/branches/3.999-DANGEROUS/share/po/pl.po
rt/branches/3.999-DANGEROUS/share/po/pt_br.po
rt/branches/3.999-DANGEROUS/share/po/ru.po
rt/branches/3.999-DANGEROUS/share/po/zh_cn.po
rt/branches/3.999-DANGEROUS/share/po/zh_tw.po
rt/branches/3.999-DANGEROUS/t/clicky.t
rt/branches/3.999-DANGEROUS/t/mail/gateway.t
rt/branches/3.999-DANGEROUS/t/ticket/link_search.t
rt/branches/3.999-DANGEROUS/t/web/command_line.t
Log:
r75829 at pinglin: jesse | 2008-01-28 22:51:28 -0500
Abort, SendEmail, some Description
Modified: rt/branches/3.999-DANGEROUS/docs/design_docs/3.3-schema-redesign.txt
==============================================================================
--- rt/branches/3.999-DANGEROUS/docs/design_docs/3.3-schema-redesign.txt (original)
+++ rt/branches/3.999-DANGEROUS/docs/design_docs/3.3-schema-redesign.txt Mon Jan 28 22:52:22 2008
@@ -34,7 +34,7 @@
Content varchar(255) NULL ,
LargeContent LONGTEXT NULL, -- New: data longer than 255 bytes
- ContentType varchar(80) NULL, -- New: MIME type of LargeContent
+ content_type varchar(80) NULL, -- New: MIME type of LargeContent
ContentEncoding varchar(80) NULL , -- New: for binary LargeContent
disabled int2 NOT NULL DEFAULT 0 , -- New: whether this is deleted
)
Modified: rt/branches/3.999-DANGEROUS/etc/initialdata
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/initialdata (original)
+++ rt/branches/3.999-DANGEROUS/etc/initialdata Mon Jan 28 22:52:22 2008
@@ -61,114 +61,114 @@
}, );
@Queues = ({ name => 'General',
- Description => 'The default queue',
+ description => 'The default queue',
correspond_address => "",
comment_address => "", },
{ name => '___Approvals',
- Description => 'A system-internal queue for the approvals system',
+ description => 'A system-internal queue for the approvals system',
disabled => 2, } );
@ScripActions = (
{ name => 'Autoreply To Requestors', # loc
- Description =>
+ description =>
'Always sends a message to the requestors independent of message sender' , # loc
ExecModule => 'Autoreply',
argument => 'Requestor' },
{ name => 'Notify Requestors', # loc
- Description => 'Sends a message to the requestors', # loc
+ description => 'Sends a message to the requestors', # loc
ExecModule => 'Notify',
argument => 'Requestor' },
{ name => 'Notify Owner as comment', # loc
- Description => 'Sends mail to the owner', # loc
+ description => 'Sends mail to the owner', # loc
ExecModule => 'NotifyAsComment',
argument => 'Owner' },
{ name => 'Notify Owner', # loc
- Description => 'Sends mail to the owner', # loc
+ description => 'Sends mail to the owner', # loc
ExecModule => 'Notify',
argument => 'Owner' },
{ name => 'Notify Ccs as comment', # loc
- Description => 'Sends mail to the Ccs as a comment', # loc
+ description => 'Sends mail to the Ccs as a comment', # loc
ExecModule => 'NotifyAsComment',
argument => 'Cc' },
{ name => 'Notify Ccs', # loc
- Description => 'Sends mail to the Ccs', # loc
+ description => 'Sends mail to the Ccs', # loc
ExecModule => 'Notify',
argument => 'Cc' },
{ name => 'Notify AdminCcs as comment', # loc
- Description => 'Sends mail to the administrative Ccs as a comment', # loc
+ description => 'Sends mail to the administrative Ccs as a comment', # loc
ExecModule => 'NotifyAsComment',
argument => 'AdminCc' },
{ name => 'Notify AdminCcs', # loc
- Description => 'Sends mail to the administrative Ccs', # loc
+ description => 'Sends mail to the administrative Ccs', # loc
ExecModule => 'Notify',
argument => 'AdminCc' },
{ name => 'Notify Requestors and Ccs as comment', # loc
- Description => 'Send mail to requestors and Ccs as a comment', # loc
+ description => 'Send mail to requestors and Ccs as a comment', # loc
ExecModule => 'NotifyAsComment',
argument => 'Requestor,Cc' },
{ name => 'Notify Requestors and Ccs', # loc
- Description => 'Send mail to requestors and Ccs', # loc
+ description => 'Send mail to requestors and Ccs', # loc
ExecModule => 'Notify',
argument => 'Requestor,Cc' },
{ name => 'Notify Requestors, Ccs and AdminCcs as comment', # loc
- Description => 'Send mail to all watchers as a "comment"', # loc
+ description => 'Send mail to all watchers as a "comment"', # loc
ExecModule => 'NotifyAsComment',
argument => 'All' },
{ name => 'Notify Requestors, Ccs and AdminCcs', # loc
- Description => 'Send mail to all watchers', # loc
+ description => 'Send mail to all watchers', # loc
ExecModule => 'Notify',
argument => 'All' },
{ name => 'Notify Other Recipients as comment', # loc
- Description => 'Sends mail to explicitly listed Ccs and Bccs', # loc
+ description => 'Sends mail to explicitly listed Ccs and Bccs', # loc
ExecModule => 'NotifyAsComment',
argument => 'OtherRecipients' },
{ name => 'Notify Other Recipients', # loc
- Description => 'Sends mail to explicitly listed Ccs and Bccs', # loc
+ description => 'Sends mail to explicitly listed Ccs and Bccs', # loc
ExecModule => 'Notify',
argument => 'OtherRecipients' },
{ name => 'User Defined', # loc
- Description => 'Perform a user-defined action', # loc
+ description => 'Perform a user-defined action', # loc
ExecModule => 'UserDefined', },
{ name => 'Create Tickets', # loc
- Description =>
+ description =>
'Create new tickets based on this scrip\'s template', # loc
ExecModule => 'CreateTickets', },
{ name => 'Open Tickets', # loc
- Description => 'Open tickets on correspondence', # loc
+ description => 'Open tickets on correspondence', # loc
ExecModule => 'AutoOpen' },
);
@ScripConditions = (
{ name => 'On Create', # loc
- Description => 'When a ticket is Created', # loc
+ description => 'When a ticket is Created', # loc
applicable_trans_types => 'Create',
ExecModule => 'AnyTransaction', },
{ name => 'On Transaction', # loc
- Description => 'When anything happens', # loc
+ description => 'When anything happens', # loc
applicable_trans_types => 'Any',
ExecModule => 'AnyTransaction', },
{
name => 'On Correspond', # loc
- Description => 'Whenever correspondence comes in', # loc
+ description => 'Whenever correspondence comes in', # loc
applicable_trans_types => 'Correspond',
ExecModule => 'AnyTransaction', },
{
name => 'On comment', # loc
- Description => 'Whenever comments come in', # loc
+ description => 'Whenever comments come in', # loc
applicable_trans_types => 'comment',
ExecModule => 'AnyTransaction' },
{
name => 'On Status Change', # loc
- Description => 'Whenever a ticket\'s status changes', # loc
+ description => 'Whenever a ticket\'s status changes', # loc
applicable_trans_types => 'Status',
ExecModule => 'AnyTransaction',
@@ -176,14 +176,14 @@
{
name => 'On Priority Change', # loc
- Description => 'Whenever a ticket\'s priority changes', # loc
+ description => 'Whenever a ticket\'s priority changes', # loc
applicable_trans_types => 'Set',
ExecModule => 'PriorityChange',
},
{
name => 'On Owner Change', # loc
- Description => 'Whenever a ticket\'s owner changes', # loc
+ description => 'Whenever a ticket\'s owner changes', # loc
applicable_trans_types => 'Any',
ExecModule => 'OwnerChange',
@@ -191,13 +191,13 @@
{
name => 'On Queue Change', # loc
- Description => 'Whenever a ticket\'s queue changes', # loc
+ description => 'Whenever a ticket\'s queue changes', # loc
applicable_trans_types => 'Set',
ExecModule => 'QueueChange',
},
{ name => 'On Resolve', # loc
- Description => 'Whenever a ticket is resolved', # loc
+ description => 'Whenever a ticket is resolved', # loc
applicable_trans_types => 'Status',
ExecModule => 'StatusChange',
argument => 'resolved'
@@ -205,19 +205,19 @@
},
{ name => 'User Defined', # loc
- Description => 'Whenever a user-defined condition occurs', # loc
+ description => 'Whenever a user-defined condition occurs', # loc
applicable_trans_types => 'Any',
ExecModule => 'UserDefined'
},
{ name => 'On Close', # loc
- Description => 'Whenever a ticket is closed(inactivated)', # loc
+ description => 'Whenever a ticket is closed(inactivated)', # loc
applicable_trans_types => 'Status,Set',
ExecModule => 'CloseTicket',
},
{ name => 'On Reopen', # loc
- Description => 'Whenever a ticket is reopened(activated)', # loc
+ description => 'Whenever a ticket is reopened(activated)', # loc
applicable_trans_types => 'Status,Set',
ExecModule => 'ReopenTicket',
},
@@ -227,11 +227,11 @@
@Templates = (
{ Queue => '0',
name => 'Blank', # loc
- Description => 'A blank template', # loc
+ description => 'A blank template', # loc
content => '', },
{ Queue => '0',
name => 'Autoreply', # loc
- Description => 'Default Autoresponse template', # loc
+ description => 'Default Autoresponse template', # loc
content => 'Subject: AutoReply: {$Ticket->subject}
@@ -262,7 +262,7 @@
{ Queue => '0',
name => 'Transaction', # loc
- Description => 'Default transaction template', # loc
+ description => 'Default transaction template', # loc
content => 'RT-Attach-Message: yes
@@ -284,7 +284,7 @@
Queue => '0',
name => 'Admin Correspondence', # loc
- Description => 'Default admin correspondence template', # loc
+ description => 'Default admin correspondence template', # loc
content => 'RT-Attach-Message: yes
@@ -296,7 +296,7 @@
{ Queue => '0',
name => 'Correspondence', # loc
- Description => 'Default correspondence template', # loc
+ description => 'Default correspondence template', # loc
content => 'RT-Attach-Message: yes
{$Transaction->content()}
@@ -305,7 +305,7 @@
{ Queue => '0',
name => 'Admin comment', # loc
- Description => 'Default admin comment template', # loc
+ description => 'Default admin comment template', # loc
content =>
'Subject: [comment] {my $s=($Transaction->subject||$Ticket->subject); $s =~ s/\\[comment\\]//g; $s =~ s/^Re//i; $s;}
@@ -319,7 +319,7 @@
{ Queue => '0',
name => 'Status Change', # loc
- Description => 'Ticket status changed', # loc
+ description => 'Ticket status changed', # loc
content => 'Subject: Status Changed to: {$Transaction->new_value}
@@ -333,7 +333,7 @@
Queue => '0',
name => 'Resolved', # loc
- Description => 'Ticket Resolved', # loc
+ description => 'Ticket Resolved', # loc
content => 'Subject: Resolved: {$Ticket->subject}
According to our records, your request has been resolved. If you have any
@@ -342,7 +342,7 @@
},
{ Queue => '___Approvals',
name => "New Pending Approval", # loc
- Description =>
+ description =>
"Notify Owners and AdminCcs of new items pending their approval", # loc
content => 'Subject: New Pending Approval: {$Ticket->subject}
@@ -361,7 +361,7 @@
},
{ Queue => '___Approvals',
name => "Approval Passed", # loc
- Description =>
+ description =>
"Notify Owner of their ticket has been approved by some approver", # loc
content => 'Subject: Ticket Approved: {$Ticket->subject}
@@ -373,7 +373,7 @@
},
{ Queue => '___Approvals',
name => "All Approvals Passed", # loc
- Description =>
+ description =>
"Notify Owner of their ticket has been approved by all approvers", # loc
content => 'Subject: Ticket Approved: {$Ticket->subject}
@@ -384,7 +384,7 @@
},
{ Queue => '___Approvals',
name => "Approval Rejected", # loc
- Description =>
+ description =>
"Notify Owner of their rejected ticket", # loc
content => 'Subject: Ticket Rejected: {$Ticket->subject}
@@ -395,7 +395,7 @@
},
{ Queue => 0,
name => "Forward", # loc
- Description => "Heading of a forwarded message", # loc
+ description => "Heading of a forwarded message", # loc
content => q{
This is forward of transaction #{ $Transaction->id } of a ticket #{ $Ticket->id }
@@ -403,7 +403,7 @@
},
{ Queue => 0,
name => "Error: public key", # loc
- Description =>
+ description =>
"Inform user that he has problems with public key and couldn't recieve encrypted content", # loc
content => q{Subject: We have no your public key or it's wrong
@@ -412,7 +412,7 @@
},
{ Queue => 0,
name => "Error to RT owner: public key", # loc
- Description =>
+ description =>
"Inform RT owner that user(s) have problems with public keys", # loc
content => q{Subject: Some users have problems with public keys
@@ -425,7 +425,7 @@
},
{ Queue => 0,
name => "Error: no private key", # loc
- Description =>
+ description =>
"Inform user that we received an encrypted email and we have no private keys to decrypt", # loc
content => q{Subject: we received message we cannot decrypt
@@ -437,7 +437,7 @@
},
{ Queue => 0,
name => "Error: bad GnuPG data", # loc
- Description =>
+ description =>
"Inform user that a message he sent has invalid GnuPG data", # loc
content => q{Subject: We received a message we cannot handle
@@ -449,7 +449,7 @@
},
{ Queue => 0,
name => "passwordChange", # loc
- Description =>
+ description =>
"Inform user that his password has been reset", # loc
content => q{Subject: [{RT->config->get('rtname')}] password reset
@@ -465,47 +465,47 @@
# }}}
@Scrips = (
- { Description => 'On Correspond Open Tickets',
+ { description => 'On Correspond Open Tickets',
ScripCondition => 'On Correspond',
ScripAction => 'Open Tickets',
Template => 'Blank' },
- { Description => 'On Owner Change Notify Owner',
+ { description => 'On Owner Change Notify Owner',
ScripCondition => 'On Owner Change',
ScripAction => 'Notify Owner',
Template => 'Transaction' },
- { Description => 'On Create Autoreply To Requestors',
+ { description => 'On Create Autoreply To Requestors',
ScripCondition => 'On Create',
ScripAction => 'AutoReply To Requestors',
Template => 'AutoReply' },
- { Description => 'On Create Notify AdminCcs',
+ { description => 'On Create Notify AdminCcs',
ScripCondition => 'On Create',
ScripAction => 'Notify AdminCcs',
Template => 'Transaction' },
- { Description => 'On Correspond Notify AdminCcs',
+ { description => 'On Correspond Notify AdminCcs',
ScripCondition => 'On Correspond',
ScripAction => 'Notify AdminCcs',
Template => 'Admin Correspondence' },
- { Description => 'On Correspond Notify Requestors and Ccs',
+ { description => 'On Correspond Notify Requestors and Ccs',
ScripCondition => 'On Correspond',
ScripAction => 'Notify Requestors And Ccs',
Template => 'Correspondence' },
- { Description => 'On Correspond Notify Other Recipients',
+ { description => 'On Correspond Notify Other Recipients',
ScripCondition => 'On Correspond',
ScripAction => 'Notify Other Recipients',
Template => 'Correspondence' },
- { Description => 'On comment Notify AdminCcs as comment',
+ { description => 'On comment Notify AdminCcs as comment',
ScripCondition => 'On comment',
ScripAction => 'Notify AdminCcs As comment',
Template => 'Admin comment' },
- { Description => 'On comment Notify Other Recipients as comment',
+ { description => 'On comment Notify Other Recipients as comment',
ScripCondition => 'On comment',
ScripAction => 'Notify Other Recipients As comment',
Template => 'Correspondence' },
- { Description => 'On Resolve Notify Requestors',
+ { description => 'On Resolve Notify Requestors',
ScripCondition => 'On Resolve',
ScripAction => 'Notify Requestors',
Template => 'Resolved' },
- { Description => "When an approval ticket is Created, notify the Owner and AdminCc of the item awaiting their approval", # loc
+ { description => "When an approval ticket is Created, notify the Owner and AdminCc of the item awaiting their approval", # loc
Queue => '___Approvals',
ScripCondition => 'User Defined',
CustomIsApplicableCode => q[
@@ -516,7 +516,7 @@
],
ScripAction => 'Notify Owner',
Template => 'New Pending Approval' },
- { Description => "If an approval is rejected, reject the original and delete pending approvals", # loc
+ { description => "If an approval is rejected, reject the original and delete pending approvals", # loc
Queue => '___Approvals',
ScripCondition => 'On Status Change',
ScripAction => 'User Defined',
@@ -572,7 +572,7 @@
],
CustomCommitCode => '"never needed"',
Template => 'Approval Rejected', },
- { Description => "When a ticket has been approved by any approver, add correspondence to the original ticket", # loc
+ { description => "When a ticket has been approved by any approver, add correspondence to the original ticket", # loc
Queue => '___Approvals',
ScripCondition => 'On Resolve',
ScripAction => 'User Defined',
@@ -608,7 +608,7 @@
],
CustomCommitCode => '"never needed"',
Template => 'Approval Passed' },
- { Description => "When a ticket has been approved by all approvers, add correspondence to the original ticket", # loc
+ { description => "When a ticket has been approved by all approvers, add correspondence to the original ticket", # loc
Queue => '___Approvals',
ScripCondition => 'On Resolve',
ScripAction => 'User Defined',
Modified: rt/branches/3.999-DANGEROUS/etc/schema.Informix
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/schema.Informix (original)
+++ rt/branches/3.999-DANGEROUS/etc/schema.Informix Mon Jan 28 22:52:22 2008
@@ -10,7 +10,7 @@
MessageId VARCHAR(160),
Subject VARCHAR(255),
Filename VARCHAR(255),
- ContentType VARCHAR(80),
+ content_type VARCHAR(80),
ContentEncoding VARCHAR(80),
Content BYTE,
Headers BYTE,
@@ -341,7 +341,7 @@
name VARCHAR(255) DEFAULT '' NOT NULL,
Description VARCHAR(255) DEFAULT NULL,
Content BYTE,
- ContentType VARCHAR(16),
+ content_type VARCHAR(16),
object_type VARCHAR(25) NOT NULL,
object_id INTEGER DEFAULT 0 NOT NULL,
Creator INTEGER DEFAULT 0 NOT NULL,
Modified: rt/branches/3.999-DANGEROUS/etc/schema.Oracle
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/schema.Oracle (original)
+++ rt/branches/3.999-DANGEROUS/etc/schema.Oracle Mon Jan 28 22:52:22 2008
@@ -8,7 +8,7 @@
MessageId VARCHAR2(160),
Subject VARCHAR2(255),
Filename VARCHAR2(255),
- ContentType VARCHAR2(80),
+ content_type VARCHAR2(80),
ContentEncoding VARCHAR2(80),
Content CLOB,
Headers CLOB,
@@ -322,7 +322,7 @@
SortOrder NUMBER(11,0) DEFAULT 0 NOT NULL,
Content VARCHAR2(255),
LargeContent CLOB,
- ContentType VARCHAR2(80),
+ content_type VARCHAR2(80),
ContentEncoding VARCHAR2(80),
Creator NUMBER(11,0) DEFAULT 0 NOT NULL,
Created DATE,
@@ -376,7 +376,7 @@
name VARCHAR2(255) NOT NULL,
Description VARCHAR2(255),
Content CLOB,
- ContentType VARCHAR(16),
+ content_type VARCHAR(16),
object_type VARCHAR2(25) NOT NULL,
object_id NUMBER(11,0) DEFAULT 0 NOT NULL,
Creator NUMBER(11,0) DEFAULT 0 NOT NULL,
Modified: rt/branches/3.999-DANGEROUS/etc/schema.Pg
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/schema.Pg (original)
+++ rt/branches/3.999-DANGEROUS/etc/schema.Pg Mon Jan 28 22:52:22 2008
@@ -20,7 +20,7 @@
MessageId varchar(160) NULL ,
Subject varchar(255) NULL ,
Filename varchar(255) NULL ,
- ContentType varchar(80) NULL ,
+ content_type varchar(80) NULL ,
ContentEncoding varchar(80) NULL ,
Content text NULL ,
Headers text NULL ,
@@ -495,7 +495,7 @@
Content varchar(255) NULL ,
LargeContent text NULL,
- ContentType varchar(80) NULL,
+ content_type varchar(80) NULL,
ContentEncoding varchar(80) NULL ,
Creator integer NOT NULL DEFAULT 0 ,
@@ -603,7 +603,7 @@
name varchar(255) NOT NULL ,
Description varchar(255) NULL ,
Content text,
- ContentType varchar(16),
+ content_type varchar(16),
object_type varchar(64),
object_id integer,
Creator integer NOT NULL DEFAULT 0 ,
Modified: rt/branches/3.999-DANGEROUS/etc/schema.SQLite
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/schema.SQLite (original)
+++ rt/branches/3.999-DANGEROUS/etc/schema.SQLite Mon Jan 28 22:52:22 2008
@@ -7,7 +7,7 @@
MessageId varchar(160) NULL ,
Subject varchar(255) NULL ,
Filename varchar(255) NULL ,
- ContentType varchar(80) NULL ,
+ content_type varchar(80) NULL ,
ContentEncoding varchar(80) NULL ,
Content LONGTEXT NULL ,
Headers LONGTEXT NULL ,
@@ -344,7 +344,7 @@
Content varchar(255) NULL ,
LargeContent LONGTEXT NULL, # New -- to hold 255+ strings
- ContentType varchar(80) NULL, # New -- only text/* gets searched
+ content_type varchar(80) NULL, # New -- only text/* gets searched
ContentEncoding varchar(80) NULL , # New -- for binary Content
Creator integer NOT NULL DEFAULT 0 ,
@@ -426,7 +426,7 @@
name varchar(255) NOT NULL ,
Description varchar(255) NULL ,
Content LONGTEXT NULL ,
- ContentType varchar(16),
+ content_type varchar(16),
object_type varchar(25) NOT NULL ,
object_id INTEGER default 0,
Creator integer NULL ,
Modified: rt/branches/3.999-DANGEROUS/etc/schema.Sybase
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/schema.Sybase (original)
+++ rt/branches/3.999-DANGEROUS/etc/schema.Sybase Mon Jan 28 22:52:22 2008
@@ -7,7 +7,7 @@
MessageId varchar(160) NULL ,
Subject varchar(255) NULL ,
Filename varchar(255) NULL ,
- ContentType varchar(80) NULL ,
+ content_type varchar(80) NULL ,
ContentEncoding varchar(80) NULL ,
Content TEXT NULL ,
Headers TEXT NULL ,
@@ -414,7 +414,7 @@
name varchar(255) NULL ,
Description varchar(255) NULL ,
Content text,
- ContentType varchar(16),
+ content_type varchar(16),
object_type varchar(64),
object_id integer, # foreign key to anything
Creator integer NOT NULL ,
Modified: rt/branches/3.999-DANGEROUS/etc/schema.mysql
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/schema.mysql (original)
+++ rt/branches/3.999-DANGEROUS/etc/schema.mysql Mon Jan 28 22:52:22 2008
@@ -7,7 +7,7 @@
MessageId varchar(160) NULL ,
Subject varchar(255) NULL ,
Filename varchar(255) NULL ,
- ContentType varchar(80) NULL ,
+ content_type varchar(80) NULL ,
ContentEncoding varchar(80) NULL ,
Content LONGBLOB NULL ,
Headers LONGTEXT NULL ,
@@ -349,7 +349,7 @@
Content varchar(255) NULL ,
LargeContent LONGTEXT NULL, # New -- to hold 255+ strings
- ContentType varchar(80) NULL, # New -- only text/* gets searched
+ content_type varchar(80) NULL, # New -- only text/* gets searched
ContentEncoding varchar(80) NULL , # New -- for binary Content
Creator integer NOT NULL DEFAULT 0 ,
@@ -433,7 +433,7 @@
name varchar(255) NULL ,
Description varchar(255) NULL ,
Content text,
- ContentType varchar(16),
+ content_type varchar(16),
object_type varchar(64),
object_id integer, # foreign key to anything
Creator integer NOT NULL DEFAULT 0 ,
Modified: rt/branches/3.999-DANGEROUS/etc/upgrade/3.1.0/schema.Informix
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/upgrade/3.1.0/schema.Informix (original)
+++ rt/branches/3.999-DANGEROUS/etc/upgrade/3.1.0/schema.Informix Mon Jan 28 22:52:22 2008
@@ -3,7 +3,7 @@
name VARCHAR(255) DEFAULT '' NOT NULL,
Description VARCHAR(255) DEFAULT NULL,
Content BYTE,
- ContentType VARCHAR(16),
+ content_type VARCHAR(16),
object_type VARCHAR(25) NOT NULL,
object_id INTEGER DEFAULT 0 NOT NULL,
Creator INTEGER DEFAULT 0 NOT NULL,
Modified: rt/branches/3.999-DANGEROUS/etc/upgrade/3.1.0/schema.Oracle
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/upgrade/3.1.0/schema.Oracle (original)
+++ rt/branches/3.999-DANGEROUS/etc/upgrade/3.1.0/schema.Oracle Mon Jan 28 22:52:22 2008
@@ -4,7 +4,7 @@
name VARCHAR2(255) NOT NULL,
Description VARCHAR2(255),
Content CLOB,
- ContentType VARCHAR(16),
+ content_type VARCHAR(16),
object_type VARCHAR2(25) NOT NULL,
object_id NUMBER(11,0) DEFAULT 0 NOT NULL,
Creator NUMBER(11,0) DEFAULT 0 NOT NULL,
Modified: rt/branches/3.999-DANGEROUS/etc/upgrade/3.1.0/schema.Pg
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/upgrade/3.1.0/schema.Pg (original)
+++ rt/branches/3.999-DANGEROUS/etc/upgrade/3.1.0/schema.Pg Mon Jan 28 22:52:22 2008
@@ -7,7 +7,7 @@
name varchar(255) NOT NULL ,
Description varchar(255) NULL ,
Content text,
- ContentType varchar(16),
+ content_type varchar(16),
object_type varchar(64),
object_id integer,
Creator integer NOT NULL DEFAULT 0 ,
Modified: rt/branches/3.999-DANGEROUS/etc/upgrade/3.1.0/schema.SQLite
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/upgrade/3.1.0/schema.SQLite (original)
+++ rt/branches/3.999-DANGEROUS/etc/upgrade/3.1.0/schema.SQLite Mon Jan 28 22:52:22 2008
@@ -4,7 +4,7 @@
name varchar(255) NOT NULL ,
Description varchar(255) NULL ,
Content LONGTEXT NULL ,
- ContentType varchar(16),
+ content_type varchar(16),
object_type varchar(25) NOT NULL ,
object_id INTEGER default 0,
Creator integer NULL ,
Modified: rt/branches/3.999-DANGEROUS/etc/upgrade/3.1.0/schema.mysql
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/upgrade/3.1.0/schema.mysql (original)
+++ rt/branches/3.999-DANGEROUS/etc/upgrade/3.1.0/schema.mysql Mon Jan 28 22:52:22 2008
@@ -5,7 +5,7 @@
name varchar(255) NULL ,
Description varchar(255) NULL ,
Content text,
- ContentType varchar(16),
+ content_type varchar(16),
object_type varchar(64),
object_id integer, # foreign key to anything
Creator integer NOT NULL DEFAULT 0 ,
Modified: rt/branches/3.999-DANGEROUS/etc/upgrade/3.3.0/schema.Oracle
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/upgrade/3.3.0/schema.Oracle (original)
+++ rt/branches/3.999-DANGEROUS/etc/upgrade/3.3.0/schema.Oracle Mon Jan 28 22:52:22 2008
@@ -19,7 +19,7 @@
UPDATE Objectcustom_field_values SET disabled = 0;
ALTER TABLE Objectcustom_field_values MODIFY disabled NOT NULL;
ALTER TABLE Objectcustom_field_values ADD LargeContent CLOB NULL;
-ALTER TABLE Objectcustom_field_values ADD ContentType VARCHAR2(80) NULL;
+ALTER TABLE Objectcustom_field_values ADD content_type VARCHAR2(80) NULL;
ALTER TABLE Objectcustom_field_values ADD ContentEncoding VARCHAR2(80) NULL;
ALTER TABLE Objectcustom_field_values ADD SortOrder NUMBER(11,0) DEFAULT 0 NOT NULL;
Modified: rt/branches/3.999-DANGEROUS/etc/upgrade/3.3.0/schema.Pg
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/upgrade/3.3.0/schema.Pg (original)
+++ rt/branches/3.999-DANGEROUS/etc/upgrade/3.3.0/schema.Pg Mon Jan 28 22:52:22 2008
@@ -29,7 +29,7 @@
alter table objectcustomfieldvalues add column LargeContent TEXT NULL;
-alter table objectcustomfieldvalues add column ContentType varchar(80) NULL;
+alter table objectcustomfieldvalues add column content_type varchar(80) NULL;
alter table objectcustomfieldvalues add column ContentEncoding varchar(80) NULL;
Modified: rt/branches/3.999-DANGEROUS/etc/upgrade/3.3.0/schema.mysql
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/upgrade/3.3.0/schema.mysql (original)
+++ rt/branches/3.999-DANGEROUS/etc/upgrade/3.3.0/schema.mysql Mon Jan 28 22:52:22 2008
@@ -21,7 +21,7 @@
alter table Objectcustom_field_values add column LargeContent LONGTEXT NULL;
-alter table Objectcustom_field_values add column ContentType varchar(80) NULL;
+alter table Objectcustom_field_values add column content_type varchar(80) NULL;
alter table Objectcustom_field_values add column ContentEncoding varchar(80) NULL;
Modified: rt/branches/3.999-DANGEROUS/html/Admin/CustomFields/Objects.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/CustomFields/Objects.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/CustomFields/Objects.html Mon Jan 28 22:52:22 2008
@@ -70,10 +70,10 @@
my $CF = RT::Model::CustomField->new();
$CF->load($id) if ($id);
-unless ($CF->id) { Abort(_("Could not load CustomField %1"), $id)};
+unless ($CF->id) { abort(_("Could not load CustomField %1"), $id)};
my $LookupType = $CF->LookupType || '';
$LookupType =~ /^(.*?)-/ ||
- Abort(_("Object of type %1 cannot take custom fields", $LookupType));
+ abort(_("Object of type %1 cannot take custom fields", $LookupType));
my $Class = $1;
my $CollectionClass;
@@ -87,7 +87,7 @@
$CollectionClass = $Class.'s';
} else {
- Abort(_("Can't find a collection class for '%1'", $Class));
+ abort(_("Can't find a collection class for '%1'", $Class));
}
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditCustomField
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditCustomField (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Elements/EditCustomField Mon Jan 28 22:52:22 2008
@@ -112,13 +112,13 @@
# off in the files that use this component.)
unless ($val) {
$m->clear_buffer;
- Abort(_("Could not create CustomField: %1", $msg));
+ abort(_("Could not create CustomField: %1", $msg));
}
push @results, $msg;
$CustomFieldObj->set_SortOrder($CustomFieldObj->id);
$title = _('Created CustomField %1', $CustomFieldObj->name());
} else {
- $CustomFieldObj->load($CustomField) || Abort(_('No CustomField'));
+ $CustomFieldObj->load($CustomField) || abort(_('No CustomField'));
$title = _('Editing CustomField %1', $CustomFieldObj->name());
my @aresults = process_custom_field_updates (
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Elements/ObjectCustomFields
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Elements/ObjectCustomFields (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Elements/ObjectCustomFields Mon Jan 28 22:52:22 2008
@@ -62,7 +62,7 @@
<%INIT>
# XXX TODO: Validate here?
#$object_type =~ /^RT::(Queue|User|Group)$/
-# or Abort(_("Object of type %1 cannot take custom fields", $object_type));
+# or abort(_("Object of type %1 cannot take custom fields", $object_type));
@@ -82,7 +82,7 @@
}
if ($id) {
- $Object->load($id) || Abort(_("Couldn't load object %1", $id));
+ $Object->load($id) || abort(_("Couldn't load object %1", $id));
$ObjectTabs = "/Admin/Elements/${Type}Tabs";
} else {
$ObjectTabs = "/Admin/Elements/GlobalCustomFieldTabs";
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Global/Template.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Global/Template.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Global/Template.html Mon Jan 28 22:52:22 2008
@@ -95,11 +95,11 @@
else {
if (defined ($Template) && $Template eq 'new') {
my ($val, $msg) = $template_obj->create(Queue => $Queue, name => $name);
- Abort(_("Could not create template: %1", $msg)) unless ($val);
+ abort(_("Could not create template: %1", $msg)) unless ($val);
push @results, $msg;
}
else {
- $template_obj->load($Template) || Abort(_('No Template'));
+ $template_obj->load($Template) || abort(_('No Template'));
}
$title = _('Modify template %1', loc($template_obj->name()));
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Groups/GroupRights.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Groups/GroupRights.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Groups/GroupRights.html Mon Jan 28 22:52:22 2008
@@ -104,11 +104,11 @@
if (!defined $id) {
- Abort(_("No Group defined"));
+ abort(_("No Group defined"));
}
my $GroupObj = RT::Model::Group->new();
-$GroupObj->load($id) || Abort(_("Couldn't load group %1",$id));
+$GroupObj->load($id) || abort(_("Couldn't load group %1",$id));
my $Groups;
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Groups/History.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Groups/History.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Groups/History.html Mon Jan 28 22:52:22 2008
@@ -60,7 +60,7 @@
<%INIT>
my $current_tab = 'Admin/Groups/History.html?id='.$id;
my $GroupObj = RT::Model::Group->new();
-$GroupObj->load($id) || Abort("Couldn't load group '$id'");
+$GroupObj->load($id) || abort("Couldn't load group '$id'");
my $title = _("History of the group %1", $GroupObj->name);
</%INIT>
<%ARGS>
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Groups/Members.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Groups/Members.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Groups/Members.html Mon Jan 28 22:52:22 2008
@@ -111,7 +111,7 @@
<%INIT>
my $Group = new RT::Model::Group();
-$Group->load($id) || Abort(_('Could not load group'));
+$Group->load($id) || abort(_('Could not load group'));
my (%UsersSeen, %GroupsSeen);
$GroupsSeen{ $Group->id } = 1; # can't be a member of ourself
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Groups/Modify.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Groups/Modify.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Groups/Modify.html Mon Jan 28 22:52:22 2008
@@ -112,12 +112,12 @@
my ($create_id, $create_msg) = $Group->create_user_defined_group(name =>
"$name");
unless ($create_id) {
- Abort (_("Group could not be Created: %1", $create_msg));
+ abort (_("Group could not be Created: %1", $create_msg));
}
$id = $Group->id;
}
else {
- $Group->load($id) || Abort('Could not load group');
+ $Group->load($id) || abort('Could not load group');
}
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Groups/UserRights.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Groups/UserRights.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Groups/UserRights.html Mon Jan 28 22:52:22 2008
@@ -87,11 +87,11 @@
if (!defined $id) {
- Abort(_("No Group defined"));
+ abort(_("No Group defined"));
}
my $GroupObj = RT::Model::Group->new();
-$GroupObj->load($id) || Abort(_("Couldn't load group %1",$id));
+$GroupObj->load($id) || abort(_("Couldn't load group %1",$id));
# Find out which users we want to display ACL selects for
my $privileged = RT::Model::Group->new();
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Queues/CustomField.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Queues/CustomField.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Queues/CustomField.html Mon Jan 28 22:52:22 2008
@@ -62,7 +62,7 @@
my ($title, $current_subtab);
unless($queue_obj->id) {
- Abort(_("Queue %1 not found", $Queue));
+ abort(_("Queue %1 not found", $Queue));
}
if ($CustomField) {
$title = _('Modify a CustomField for queue %1', $queue_obj->name());
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Queues/CustomFields.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Queues/CustomFields.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Queues/CustomFields.html Mon Jan 28 22:52:22 2008
@@ -58,7 +58,7 @@
<%INIT>
my $Object = RT::Model::Queue->new();
-$Object->load($id) || Abort( _( "Couldn't load object %1", $id ) );
+$Object->load($id) || abort( _( "Couldn't load object %1", $id ) );
my $FriendlySubTypes =
RT::Model::CustomField->new()
->friendly_lookup_type( $Object->custom_field_lookup_type );
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Queues/GroupRights.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Queues/GroupRights.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Queues/GroupRights.html Mon Jan 28 22:52:22 2008
@@ -117,11 +117,11 @@
if (!defined $id) {
- Abort(_("No Queue defined"));
+ abort(_("No Queue defined"));
}
my $queue_obj = RT::Model::Queue->new();
-$queue_obj->load($id) || Abort(_("Couldn't load queue %1",$id));
+$queue_obj->load($id) || abort(_("Couldn't load queue %1",$id));
my $Groups;
my $current_tab;
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Queues/Modify.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Queues/Modify.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Queues/Modify.html Mon Jan 28 22:52:22 2008
@@ -126,12 +126,12 @@
} else {
if ( defined $id && $id eq 'new' ) {
my ($val, $msg) = $queue_obj->create( name => $name );
- Abort("$msg") unless $val;
+ abort("$msg") unless $val;
delete $session{'create_in_queues'};
push @results, $msg;
}
else {
- $queue_obj->load($id) || $queue_obj->load($name) || Abort(_("Couldn't load queue '%1'", $name));
+ $queue_obj->load($id) || $queue_obj->load($name) || abort(_("Couldn't load queue '%1'", $name));
}
$title = _('Editing Configuration for queue %1', $queue_obj->name);
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Queues/People.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Queues/People.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Queues/People.html Mon Jan 28 22:52:22 2008
@@ -143,7 +143,7 @@
my $queue_obj = RT::Model::Queue->new();
-$queue_obj->load($id) || Abort(_("Couldn't load queue", $id));
+$queue_obj->load($id) || abort(_("Couldn't load queue", $id));
# }}}
# {{{ Delete deletable watchers
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Queues/Scrip.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Queues/Scrip.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Queues/Scrip.html Mon Jan 28 22:52:22 2008
@@ -60,7 +60,7 @@
my $queue_obj = RT::Model::Queue->new();
$queue_obj->load( $Queue );
unless( $queue_obj->id ) {
- Abort(_("Queue %1 not found", $id));
+ abort(_("Queue %1 not found", $id));
}
my ($title, $current_subtab);
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Queues/Scrips.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Queues/Scrips.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Queues/Scrips.html Mon Jan 28 22:52:22 2008
@@ -68,7 +68,7 @@
if ($queue_obj->id) {
$title = _("Modify scrips for queue %1", $queue_obj->name);
} else {
- Abort(_("Queue %1 not found",$id));
+ abort(_("Queue %1 not found",$id));
}
my $subtabs = {
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Queues/Template.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Queues/Template.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Queues/Template.html Mon Jan 28 22:52:22 2008
@@ -92,11 +92,11 @@
else {
if ($Template eq 'new') {
my ($val, $msg) = $template_obj->create(Queue => $Queue, name => $name);
- Abort(_("Could not create template: %1", $msg)) unless ($val);
+ abort(_("Could not create template: %1", $msg)) unless ($val);
push @results, $msg;
}
else {
- $template_obj->load($Template) || Abort(_('No Template'));
+ $template_obj->load($Template) || abort(_('No Template'));
}
$title = _('Modify template %1', loc($template_obj->name()));
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Queues/Templates.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Queues/Templates.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Queues/Templates.html Mon Jan 28 22:52:22 2008
@@ -64,7 +64,7 @@
if ($queue_obj->id) {
$title = _("Edit Templates for queue %1", $queue_obj->name);
} else {
- Abort(_("Queue %1 not found",$id));
+ abort(_("Queue %1 not found",$id));
}
my $subtabs = {
A => { title => _('Select template'),
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Queues/UserRights.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Queues/UserRights.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Queues/UserRights.html Mon Jan 28 22:52:22 2008
@@ -86,11 +86,11 @@
if (!defined $id) {
- Abort(_("No Queue defined"));
+ abort(_("No Queue defined"));
}
my $queue_obj = RT::Model::Queue->new();
-$queue_obj->load($id) || Abort(_("Couldn't load queue %1",$id));
+$queue_obj->load($id) || abort(_("Couldn't load queue %1",$id));
# Find out which users we want to display ACL selects for
my $privileged = RT::Model::Group->new();
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Tools/Configuration.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Tools/Configuration.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Tools/Configuration.html Mon Jan 28 22:52:22 2008
@@ -49,7 +49,7 @@
require Module::Versions::Report;
my $title = _('System Configuration');
unless (Jifty->web->current_user->has_right( Object=> RT->system, Right => 'SuperUser')) {
- Abort(_('This feature is only available to system administrators'));
+ abort(_('This feature is only available to system administrators'));
}
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Users/CustomFields.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Users/CustomFields.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Users/CustomFields.html Mon Jan 28 22:52:22 2008
@@ -58,7 +58,7 @@
<%INIT>
my $Object = RT::Model::User->new();
-$Object->load($id) || Abort( _( "Couldn't load object %1", $id ) );
+$Object->load($id) || abort( _( "Couldn't load object %1", $id ) );
my $FriendlySubTypes =
RT::Model::CustomField->new()
->friendly_lookup_type( $Object->custom_field_lookup_type );
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Users/GnuPG.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Users/GnuPG.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Users/GnuPG.html Mon Jan 28 22:52:22 2008
@@ -42,7 +42,7 @@
my $user_object = RT::Model::User->new( );
$user_object->Load( $id );
unless ( $user_object->id ) {
- Abort( _("Couldn't load user #%1", $id) );
+ abort( _("Couldn't load user #%1", $id) );
}
$id = $ARGS{'id'} = $user_object->id;
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Users/History.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Users/History.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Users/History.html Mon Jan 28 22:52:22 2008
@@ -60,7 +60,7 @@
<%INIT>
my $current_tab = 'Admin/Users/History.html?id='.$id;
my $user_object = RT::Model::User->new();
-$user_object->load($id) || Abort("Couldn't load user '$id'");
+$user_object->load($id) || abort("Couldn't load user '$id'");
my $title = _("History of the user %1", $user_object->name);
</%INIT>
<%ARGS>
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Users/Memberships.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Users/Memberships.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Users/Memberships.html Mon Jan 28 22:52:22 2008
@@ -91,7 +91,7 @@
<%INIT>
my $user_object = RT::Model::User->new();
-$user_object->load( $id ) || Abort("Couldn't load user '$id'");
+$user_object->load( $id ) || abort("Couldn't load user '$id'");
my $title = _("Memberships of the user %1", $user_object->name);
my $current_tab = 'Admin/Users/Memberships.html?id='. $id;
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Users/Modify.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Users/Modify.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Users/Modify.html Mon Jan 28 22:52:22 2008
@@ -306,7 +306,7 @@
push @results, _('User could not be Created: %1', $msg);
}
} else {
- $user_object->load($id) || $user_object->load($name) || Abort("Couldn't load user '$name'");
+ $user_object->load($id) || $user_object->load($name) || abort("Couldn't load user '$name'");
$val = $user_object->id();
}
Modified: rt/branches/3.999-DANGEROUS/html/Admin/Users/MyRT.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Admin/Users/MyRT.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Admin/Users/MyRT.html Mon Jan 28 22:52:22 2008
@@ -74,7 +74,7 @@
my $current_tab;
$current_tab = 'Admin/Users/MyRT.html?id='.$id if ($id);
my $user_object = RT::Model::User->new();
-$user_object->load($id) || Abort("Couldn't load user '$id'");
+$user_object->load($id) || abort("Couldn't load user '$id'");
my $title = _("RT at a glance for the user %1", $user_object->name);
if ($ARGS{Reset}) {
Modified: rt/branches/3.999-DANGEROUS/html/Download/CustomFieldValue/dhandler
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Download/CustomFieldValue/dhandler (original)
+++ rt/branches/3.999-DANGEROUS/html/Download/CustomFieldValue/dhandler Mon Jan 28 22:52:22 2008
@@ -52,13 +52,13 @@
$id = $1;
}
else {
- Abort("Corrupted customfieldvalue URL.");
+ abort("Corrupted customfieldvalue URL.");
}
my $OCFV = RT::Model::ObjectCustomFieldValue->new();
-$OCFV->load($id) || Abort("OCFV '$id' could not be loaded");
+$OCFV->load($id) || abort("OCFV '$id' could not be loaded");
unless ($OCFV->id) {
- Abort("Bad OCFV id. Couldn't find OCFV '$id'\n");
+ abort("Bad OCFV id. Couldn't find OCFV '$id'\n");
}
my $content_type = $OCFV->content_type || 'text/plain';
Modified: rt/branches/3.999-DANGEROUS/html/Download/Tabular/dhandler
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Download/Tabular/dhandler (original)
+++ rt/branches/3.999-DANGEROUS/html/Download/Tabular/dhandler Mon Jan 28 22:52:22 2008
@@ -54,7 +54,7 @@
@ids = sort split(/,+/, $2);
}
else {
- Abort("Corrupted tabular URL.");
+ abort("Corrupted tabular URL.");
}
my @cols = $class->basic_columns or return;
Modified: rt/branches/3.999-DANGEROUS/html/Elements/EditCustomField
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/EditCustomField (original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/EditCustomField Mon Jan 28 22:52:22 2008
@@ -57,7 +57,7 @@
my $values;
if ( $Object && $Object->id ) {
$values = $Object->custom_field_values( $CustomField->id );
- $values->columns( qw( id CustomField object_type object_id disabled Content ContentType ContentEncoding ) );
+ $values->columns( qw( id CustomField object_type object_id disabled Content content_type ContentEncoding ) );
$namePrefix ||= join('-', 'Object', ref($Object), $Object->id, 'CustomField', '');
} elsif (not $Default) {
my %TOP = $m->request_args;
Modified: rt/branches/3.999-DANGEROUS/html/Elements/SelectAttachmentField
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/SelectAttachmentField (original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/SelectAttachmentField Mon Jan 28 22:52:22 2008
@@ -48,7 +48,7 @@
<select name="<%$name%>">
<option value="Subject"><&|/l&>Subject</&></option>
<option value="Content"><&|/l&>Content</&></option>
-<option value="ContentType"><&|/l&>content-Type</&></option>
+<option value="content_type"><&|/l&>content-Type</&></option>
<option value="Filename"><&|/l&>Filename</&></option>
</select>
<%ARGS>
Modified: rt/branches/3.999-DANGEROUS/html/Prefs/Search.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Prefs/Search.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Prefs/Search.html Mon Jan 28 22:52:22 2008
@@ -80,7 +80,7 @@
$ARGS{name} ||= '';
my ($class, $id) = ( $ARGS{name} =~ m/^(.*)-(\d+)$/ );
-Abort('No search specified')
+abort('No search specified')
unless defined $class and $class eq 'RT::Model::Attribute';
my $search = $class->new();
Modified: rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/attachments
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/attachments (original)
+++ rt/branches/3.999-DANGEROUS/html/REST/1.0/Forms/ticket/attachments Mon Jan 28 22:52:22 2008
@@ -98,7 +98,7 @@
push @data, [ Parent => $attachment->Parent ];
push @data, [ MessageId => $attachment->MessageId ];
push @data, [ Filename => $attachment->filename ];
- push @data, [ ContentType => $attachment->content_type ];
+ push @data, [ content_type => $attachment->content_type ];
push @data, [ ContentEncoding => $attachment->ContentEncoding ];
push @data, [ Headers => $attachment->headers ];
push @data, [ Content => $attachment->content ];
Modified: rt/branches/3.999-DANGEROUS/html/Search/Bulk.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Bulk.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Bulk.html Mon Jan 28 22:52:22 2008
@@ -231,7 +231,7 @@
$Page = 1 unless $Page && $Page > 0; # workaround problems with Page = '' or undef
$Tickets->set_page_info(per_page => $Rows, current_page => $Page);
-Abort( _("No search to operate on.") ) unless ($Tickets);
+abort( _("No search to operate on.") ) unless ($Tickets);
# build up a list of all custom fields for tickets that we're displaying, so
# we can display sane edit widgets.
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Attachment/WithHeaders/dhandler
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Attachment/WithHeaders/dhandler (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Attachment/WithHeaders/dhandler Mon Jan 28 22:52:22 2008
@@ -50,13 +50,13 @@
my ($id) = $m->dhandler_arg =~ /^(\d+)/;
unless ( $id ) {
# wrong url format
- Abort("Corrupted attachment URL");
+ abort("Corrupted attachment URL");
}
my $AttachmentObj = RT::Model::Attachment->new();
$AttachmentObj->load( $id );
unless ( $AttachmentObj->id ) {
- Abort("Couldn't load attachment #$id");
+ abort("Couldn't load attachment #$id");
}
# XXX: should we check handle html here and integrate headers into html?
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Attachment/dhandler
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Attachment/dhandler (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Attachment/dhandler Mon Jan 28 22:52:22 2008
@@ -53,17 +53,17 @@
$attach = $2;
}
else {
- Abort("Corrupted attachment URL.");
+ abort("Corrupted attachment URL.");
}
my $AttachmentObj = RT::Model::Attachment->new();
- $AttachmentObj->load($attach) || Abort("Attachment '$attach' could not be loaded");
+ $AttachmentObj->load($attach) || abort("Attachment '$attach' could not be loaded");
unless ($AttachmentObj->id) {
- Abort("Bad attachment id. Couldn't find attachment '$attach'\n");
+ abort("Bad attachment id. Couldn't find attachment '$attach'\n");
}
unless ($AttachmentObj->TransactionId() == $trans ) {
- Abort("Bad transaction number for attachment. $trans should be".$AttachmentObj->TransactionId() ."\n");
+ abort("Bad transaction number for attachment. $trans should be".$AttachmentObj->TransactionId() ."\n");
}
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Create.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Create.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Create.html Mon Jan 28 22:52:22 2008
@@ -246,7 +246,7 @@
my $cloneticket_obj;
if ( $cloneTicket ) {
$cloneticket_obj = RT::Model::Ticket->new();
- $cloneticket_obj->Load($cloneTicket) or Abort(_("Ticket could not be loaded"));
+ $cloneticket_obj->Load($cloneTicket) or abort(_("Ticket could not be loaded"));
my $clone = {
Requestors => join( ',', $cloneticket_obj->requestor_addresses ),
@@ -317,7 +317,7 @@
}
my @results;
my $queue_obj = RT::Model::Queue->new();
-$queue_obj->load($Queue) || Abort(_("Queue could not be loaded."));
+$queue_obj->load($Queue) || abort(_("Queue could not be loaded."));
$m->callback( queue_obj => $queue_obj, ARGSRef => \%ARGS );
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Display.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Display.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Display.html Mon Jan 28 22:52:22 2008
@@ -97,7 +97,7 @@
unless ($id || $ticket_obj) {
- Abort('No ticket specified');
+ abort('No ticket specified');
}
if ($ARGS{'id'} eq 'new') {
@@ -106,11 +106,11 @@
my $Queue = RT::Model::Queue->new();
$Queue->load($ARGS{'Queue'});
unless ( $Queue->id ) {
- Abort('Queue not found');
+ abort('Queue not found');
}
unless ( $Queue->current_user_has_right('create_ticket') ) {
- Abort('You have no permission to create tickets in that queue.');
+ abort('You have no permission to create tickets in that queue.');
}
($ticket_obj, @Actions) = create_ticket(
@@ -118,7 +118,7 @@
%ARGS,
);
unless ( $ticket_obj->current_user_has_right('ShowTicket') ) {
- Abort("No permission to view newly Created ticket #".$ticket_obj->id.".");
+ abort("No permission to view newly Created ticket #".$ticket_obj->id.".");
}
# }}}
} else {
@@ -162,7 +162,7 @@
# XXX: we shouldn't block actions here if user has no right to see the ticket,
# but we should allow him to see actions he has done
unless ($ticket_obj->current_user_has_right('ShowTicket')) {
- Abort("No permission to view ticket");
+ abort("No permission to view ticket");
}
if ( $ARGS{'MarkAsSeen'} ) {
$ticket_obj->set_attribute(
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/FindAttachments
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/FindAttachments (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/FindAttachments Mon Jan 28 22:52:22 2008
@@ -55,7 +55,7 @@
# code that looks at attachments will look at each one in turn.
my $attachments = RT::Model::AttachmentCollection->new();
-$attachments->columns( qw( id Filename ContentType Headers Subject Parent ContentEncoding ContentType TransactionId Created));
+$attachments->columns( qw( id Filename content_type Headers Subject Parent ContentEncoding content_type TransactionId Created));
my $transactions = $attachments->new_alias('Transactions');
$attachments->join( alias1 => 'main',
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/LoadTextAttachments
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/LoadTextAttachments (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/LoadTextAttachments Mon Jan 28 22:52:22 2008
@@ -49,7 +49,7 @@
my $attachments = RT::Model::AttachmentCollection->new();
-$attachments->columns( qw(id Content ContentType TransactionId ContentEncoding));
+$attachments->columns( qw(id Content content_type TransactionId ContentEncoding));
if ( $Ticket->current_user_has_right('ShowTicket') ) {
my $transactions = $attachments->new_alias('Transactions');
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowTransaction
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowTransaction (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/ShowTransaction Mon Jan 28 22:52:22 2008
@@ -153,7 +153,7 @@
unless ($Attachments) {
my $attachments = $Transaction->attachments;
- $attachments->columns( qw( id Filename ContentType Headers Subject Parent ContentEncoding ContentType TransactionId) );
+ $attachments->columns( qw( id Filename content_type Headers Subject Parent ContentEncoding content_type TransactionId) );
$Attachments = $attachments->items_array_ref();
}
my $titlebar_commands = ' ';
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Forward.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Forward.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Forward.html Mon Jan 28 22:52:22 2008
@@ -82,12 +82,12 @@
my $ticket_obj = load_ticket($id);
$id = $ARGS{'id'} = $ticket_obj->id;
-Abort( _("Permission denied") )
+abort( _("Permission denied") )
unless $ticket_obj->current_user_has_right('ForwardMessage');
my $txn = RT::Transaction->new();
$txn->load( $QuoteTransaction );
-Abort( _("Couldn't load transaction #%1", $QuoteTransaction) )
+abort( _("Couldn't load transaction #%1", $QuoteTransaction) )
unless $txn->id;
my @results;
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/GnuPG.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/GnuPG.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/GnuPG.html Mon Jan 28 22:52:22 2008
@@ -25,7 +25,7 @@
my $txn = RT::Model::Transaction->new();
$txn->load( $id );
unless ( $txn->id ) {
- Abort(_("Couldn't load transaction #%1", $id));
+ abort(_("Couldn't load transaction #%1", $id));
}
$id = $txn->id;
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/History.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/History.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/History.html Mon Jan 28 22:52:22 2008
@@ -77,7 +77,7 @@
my $Ticket = load_ticket ($id);
unless ($Ticket->current_user_has_right('ShowTicket')) {
- Abort("No permission to view ticket");
+ abort("No permission to view ticket");
}
my $attachments = $m->comp('Elements/FindAttachments', Ticket => $Ticket);
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Modify.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Modify.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Modify.html Mon Jan 28 22:52:22 2008
@@ -83,7 +83,7 @@
# TODO: display the results, even if we can't display the ticket
unless ($ticket_obj->current_user_has_right('ShowTicket')) {
- Abort("No permission to view ticket");
+ abort("No permission to view ticket");
}
</%INIT>
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/ModifyAll.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/ModifyAll.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/ModifyAll.html Mon Jan 28 22:52:22 2008
@@ -199,7 +199,7 @@
# TODO: display the results, even if we can't display the ticket.
unless ($Ticket->current_user_has_right('ShowTicket')) {
- Abort("No permission to view ticket");
+ abort("No permission to view ticket");
}
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/ShowEmailRecord.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/ShowEmailRecord.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/ShowEmailRecord.html Mon Jan 28 22:52:22 2008
@@ -80,12 +80,12 @@
};
my $AttachmentObj = RT::Model::Attachment->new();
-$AttachmentObj->load($Attachment) || Abort(_("Attachment '%1' could not be loaded", $Attachment));
+$AttachmentObj->load($Attachment) || abort(_("Attachment '%1' could not be loaded", $Attachment));
unless ( $AttachmentObj->id ) {
- Abort(_("Attachment '%1' could not be loaded", $Attachment));
+ abort(_("Attachment '%1' could not be loaded", $Attachment));
}
unless ($AttachmentObj->TransactionId() == $Transaction ) {
- Abort(_("Attachment '%1' could not be loaded", $Attachment));
+ abort(_("Attachment '%1' could not be loaded", $Attachment));
}
</%INIT>
Modified: rt/branches/3.999-DANGEROUS/html/User/Groups/Members.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/User/Groups/Members.html (original)
+++ rt/branches/3.999-DANGEROUS/html/User/Groups/Members.html Mon Jan 28 22:52:22 2008
@@ -110,7 +110,7 @@
$Group->load($id) ;
unless ($Group->id) {
- Abort(_('Could not load group'));
+ abort(_('Could not load group'));
}
my (@results);
Modified: rt/branches/3.999-DANGEROUS/html/User/Groups/Modify.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/User/Groups/Modify.html (original)
+++ rt/branches/3.999-DANGEROUS/html/User/Groups/Modify.html Mon Jan 28 22:52:22 2008
@@ -97,12 +97,12 @@
principal_id => Jifty->web->current_user->id
);
unless ($id) {
- Abort( _("Could not create group") );
+ abort( _("Could not create group") );
}
$id = $Group->id;
}
else {
- $Group->load($id) || Abort( _('Could not load group') );
+ $Group->load($id) || abort( _('Could not load group') );
}
if ($id) {
Modified: rt/branches/3.999-DANGEROUS/html/User/Prefs.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/User/Prefs.html (original)
+++ rt/branches/3.999-DANGEROUS/html/User/Prefs.html Mon Jan 28 22:52:22 2008
@@ -199,7 +199,7 @@
my ($val, $msg);
- $user_object->load($id) || $user_object->load($name) || Abort("Couldn't load user '$name'");
+ $user_object->load($id) || $user_object->load($name) || abort("Couldn't load user '$name'");
$val = $user_object->id();
Modified: rt/branches/3.999-DANGEROUS/lib/RT/I18N.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/I18N.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/I18N.pm Mon Jan 28 22:52:22 2008
@@ -97,7 +97,7 @@
=head2 encoding
-Returns the encoding of the current lexicon, as yanked out of __ContentType's "charset" field.
+Returns the encoding of the current lexicon, as yanked out of __content_type's "charset" field.
If it can't find anything, it returns 'ISO-8859-1'
@@ -302,7 +302,7 @@
unless ( $charset eq $enc ) {
eval { Encode::from_to( $enc_str, $charset, $enc ) };
if ($@) {
- $charset = _GuessCharset($enc_str);
+ $charset = _guess_charset($enc_str);
Encode::from_to( $enc_str, $charset, $enc );
}
}
@@ -354,19 +354,19 @@
if ( !$head_only and $head->mime_type =~ m{^text/} ) {
my $body = $entity->bodyhandle or return;
- return _GuessCharset( $body->as_string );
+ return _guess_charset( $body->as_string );
} else {
# potentially binary data -- don't guess the body
- return _GuessCharset( $head->as_string );
+ return _guess_charset( $head->as_string );
}
}
# }}}
-# {{{ _GuessCharset
+# {{{ _guess_charset
-=head2 _GuessCharset STRING
+=head2 _guess_charset STRING
use Encode::Guess to try to figure it out the string's encoding.
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email/Auth/GnuPG.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email/Auth/GnuPG.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email/Auth/GnuPG.pm Mon Jan 28 22:52:22 2008
@@ -196,7 +196,7 @@
$args{'Message'}->head
)
)[0];
- my ($status) = RT::Interface::Email::SendEmailUsingTemplate(
+ my ($status) = RT::Interface::Email::send_emailUsingTemplate(
To => $address,
Template => 'Error: no private key',
Arguments => {
@@ -227,7 +227,7 @@
$args{'Message'}->head
)
)[0];
- my ($status) = RT::Interface::Email::SendEmailUsingTemplate(
+ my ($status) = RT::Interface::Email::send_emailUsingTemplate(
To => $address,
Template => 'Error: bad GnuPG data',
Arguments => {
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web.pm Mon Jan 28 22:52:22 2008
@@ -233,7 +233,7 @@
# }}}
-# {{{ sub Abort
+# {{{ sub abort
# Error - calls Error and aborts
sub abort {
@@ -268,11 +268,11 @@
my $Queue = RT::Model::Queue->new();
unless ( $Queue->load( $ARGS{'Queue'} ) ) {
- Abort('Queue not found');
+ abort('Queue not found');
}
unless ( $Queue->current_user_has_right('create_ticket') ) {
- Abort('You have no permission to create tickets in that queue.');
+ abort('You have no permission to create tickets in that queue.');
}
my $due = RT::Date->new();
@@ -285,7 +285,7 @@
From => $ARGS{'From'},
Cc => $ARGS{'Cc'},
Body => $ARGS{'Content'},
- type => $ARGS{'ContentType'},
+ type => $ARGS{'content_type'},
);
if ( $ARGS{'Attachments'} ) {
@@ -417,12 +417,12 @@
my ( $id, $Trans, $ErrMsg ) = $Ticket->create(%create_args);
unless ($id) {
- Abort($ErrMsg);
+ abort($ErrMsg);
}
push( @Actions, split( "\n", $ErrMsg ) );
unless ( $Ticket->current_user_has_right('ShowTicket') ) {
- Abort( "No permission to view newly Created ticket #"
+ abort( "No permission to view newly Created ticket #"
. $Ticket->id
. "." );
}
@@ -451,13 +451,13 @@
}
unless ($id) {
- Abort("No ticket specified");
+ abort("No ticket specified");
}
my $Ticket = RT::Model::Ticket->new();
$Ticket->load($id);
unless ( $Ticket->id ) {
- Abort("Could not load ticket $id");
+ abort("Could not load ticket $id");
}
return $Ticket;
}
@@ -527,7 +527,7 @@
my $Message = make_mime_entity(
Subject => $args{ARGSRef}->{'UpdateSubject'},
Body => $args{ARGSRef}->{'UpdateContent'},
- type => $args{ARGSRef}->{'UpdateContentType'},
+ type => $args{ARGSRef}->{'Updatecontent_type'},
);
$Message->head->add(
@@ -1402,7 +1402,7 @@
Takes a CGI parameter name; if a file is uploaded under that name,
return a hash reference suitable for AddCustomFieldValue's use:
-C<( value => $filename, LargeContent => $content, ContentType => $type )>.
+C<( value => $filename, LargeContent => $content, content_type => $type )>.
Returns C<undef> if no files were uploaded in the C<$arg> field.
@@ -1421,7 +1421,7 @@
return {
value => $filename,
LargeContent => do { local $/; scalar <$fh> },
- ContentType => $upload_info->{'Content-Type'},
+ content_type => $upload_info->{'Content-Type'},
};
}
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/AttachmentCollection.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/AttachmentCollection.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/AttachmentCollection.pm Mon Jan 28 22:52:22 2008
@@ -114,9 +114,9 @@
return $self->{'_sql_transaction_alias'} = $res;
}
-=head2 ContentType (value => 'text/plain', entry_aggregator => 'OR', operator => '=' )
+=head2 content_type (value => 'text/plain', entry_aggregator => 'OR', operator => '=' )
-Limit result set to attachments of ContentType 'TYPE'...
+Limit result set to attachments of content_type 'TYPE'...
=cut
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomField.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomField.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/CustomField.pm Mon Jan 28 22:52:22 2008
@@ -934,7 +934,7 @@
Optional:
LargeContent
- ContentType
+ content_type
=cut
@@ -944,7 +944,7 @@
Object => undef,
Content => undef,
LargeContent => undef,
- ContentType => undef,
+ content_type => undef,
@_
);
my $obj = $args{'Object'} or return ( 0, _('Invalid object') );
@@ -987,7 +987,7 @@
object_id => $obj->id,
Content => $args{'Content'},
LargeContent => $args{'LargeContent'},
- ContentType => $args{'ContentType'},
+ content_type => $args{'content_type'},
custom_field => $self->id
);
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Link.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Link.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Link.pm Mon Jan 28 22:52:22 2008
@@ -216,7 +216,7 @@
my $target = RT::URI->new;
$target->from_uri( $args{'Target'} );
- unless ( $base->resolver && $target->Resolver ) {
+ unless ( $base->resolver && $target->resolver ) {
return ( 0, _("Couldn't load link") );
}
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/ObjectCustomFieldValue.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/ObjectCustomFieldValue.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/ObjectCustomFieldValue.pm Mon Jan 28 22:52:22 2008
@@ -58,7 +58,7 @@
use Jifty::DBI::Schema;
use Jifty::DBI::Record schema {
column
- ContentType => type is 'varchar(80)',
+ content_type => type is 'varchar(80)',
max_length is 80, default is '';
column LargeContent => type is 'longtext', default is '';
column Creator => type is 'int(11)', max_length is 11, default is '0';
@@ -102,7 +102,7 @@
disabled => 0,
Content => '',
LargeContent => undef,
- ContentType => '',
+ content_type => '',
ContentEncoding => '',
@_,
);
@@ -114,12 +114,12 @@
} else {
$args{'LargeContent'} = $args{'Content'};
$args{'Content'} = '';
- $args{'ContentType'} ||= 'text/plain';
+ $args{'content_type'} ||= 'text/plain';
}
}
( $args{'ContentEncoding'}, $args{'LargeContent'} )
- = $self->_encode_lob( $args{'LargeContent'}, $args{'ContentType'} )
+ = $self->_encode_lob( $args{'LargeContent'}, $args{'content_type'} )
if defined $args{'LargeContent'};
return $self->SUPER::create(
@@ -129,7 +129,7 @@
disabled => $args{'disabled'},
Content => $args{'Content'},
LargeContent => $args{'LargeContent'},
- ContentType => $args{'ContentType'},
+ content_type => $args{'content_type'},
ContentEncoding => $args{'ContentEncoding'},
);
}
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm Mon Jan 28 22:52:22 2008
@@ -84,7 +84,7 @@
column name => max_length is 200, type is 'varchar(200)', default is '';
column
- Description => max_length is 255,
+ description => max_length is 255,
type is 'varchar(255)', default is '';
column
correspond_address => max_length is 120,
@@ -334,7 +334,7 @@
Arguments: ARGS is a hash of named parameters. Valid parameters are:
name (required)
- Description
+ description
correspond_address
comment_address
initial_priority
@@ -351,7 +351,7 @@
my %args = (
name => undef,
correspond_address => '',
- Description => '',
+ description => '',
comment_address => '',
initial_priority => 0,
final_priority => 0,
@@ -510,7 +510,7 @@
my ( $status, $msg ) = $self->set_attribute(
name => 'Sign',
- Description => 'Sign outgoing messages by default',
+ description => 'Sign outgoing messages by default',
Content => $value,
);
return ( $status, $msg ) unless $status;
@@ -536,7 +536,7 @@
my ( $status, $msg ) = $self->set_attribute(
name => 'Encrypt',
- Description => 'Encrypt outgoing messages by default',
+ description => 'Encrypt outgoing messages by default',
Content => $value,
);
return ( $status, $msg ) unless $status;
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Scrip.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Scrip.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Scrip.pm Mon Jan 28 22:52:22 2008
@@ -77,7 +77,7 @@
column ScripAction => type is 'int';
column ScripCondition => type is 'int';
column Stage => type is 'varchar(32)', default is 'TransactionCreate';
- column Description => type is 'text';
+ column description => type is 'text';
column CustomPrepareCode => type is 'text';
column CustomCommitCode => type is 'text';
column CustomIsApplicableCode => type is 'text';
@@ -90,7 +90,7 @@
Creates a new entry in the Scrips table. Takes a paramhash with:
Queue => 0,
- Description => undef,
+ description => undef,
Template => undef,
ScripAction => undef,
ScripCondition => undef,
@@ -114,7 +114,7 @@
ScripAction => 0, # name or id
ScripCondition => 0, # name or id
Stage => 'TransactionCreate',
- Description => undef,
+ description => undef,
CustomPrepareCode => undef,
CustomCommitCode => undef,
CustomIsApplicableCode => undef,
@@ -176,7 +176,7 @@
ScripCondition => $condition->id,
Stage => $args{'Stage'},
ScripAction => $action->id,
- Description => $args{'Description'},
+ description => $args{'description'},
CustomPrepareCode => $args{'CustomPrepareCode'},
CustomCommitCode => $args{'CustomCommitCode'},
CustomIsApplicableCode => $args{'CustomIsApplicableCode'},
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/ScripAction.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/ScripAction.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/ScripAction.pm Mon Jan 28 22:52:22 2008
@@ -79,7 +79,7 @@
use Jifty::DBI::Schema;
use Jifty::DBI::Record schema {
column name => type is 'text';
- column Description => type is 'text';
+ column description => type is 'text';
column ExecModule => type is 'text';
column argument => type is 'text';
column Creator => max_length is 11, type is 'int(11)', default is '0';
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/ScripCondition.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/ScripCondition.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/ScripCondition.pm Mon Jan 28 22:52:22 2008
@@ -79,7 +79,7 @@
use Jifty::DBI::Schema;
use Jifty::DBI::Record schema {
column name => type is 'text';
- column Description => type is 'text';
+ column description => type is 'text';
column ExecModule => type is 'text';
column argument => type is 'text';
column applicable_trans_types => type is 'text';
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/TicketCollection.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/TicketCollection.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/TicketCollection.pm Mon Jan 28 22:52:22 2008
@@ -128,7 +128,7 @@
Created => [ 'DATE' => 'Created', ],
Subject => [ 'STRING', ],
Content => [ 'TRANSFIELD', ],
- ContentType => [ 'TRANSFIELD', ],
+ content_type => [ 'TRANSFIELD', ],
Filename => [ 'TRANSFIELD', ],
TransactionDate => [ 'TRANSDATE', ],
Requestor => [ 'WATCHERFIELD' => 'Requestor', ],
@@ -663,7 +663,7 @@
=head2 _TransLimit
-Limit based on the Content of a transaction or the ContentType.
+Limit based on the Content of a transaction or the content_type.
Meta Data:
none
@@ -672,7 +672,7 @@
sub _trans_limit {
- # Content, ContentType, Filename
+ # Content, content_type, Filename
# If only this was this simple. We've got to do something
# complicated here:
@@ -1937,9 +1937,9 @@
}
# }}}
-# {{{ sub limit_ContentType
+# {{{ sub limit_content_type
-=head2 limit_ContentType
+=head2 limit_content_type
Takes a paramhash with the fields operator and value.
operator is one of =, LIKE, NOT LIKE or !=.
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm Mon Jan 28 22:52:22 2008
@@ -251,7 +251,7 @@
sub table {'Transactions'}
-use vars qw( %_BriefDescriptions $PreferredContentType );
+use vars qw( %_BriefDescriptions $Preferredcontent_type );
use RT::Model::AttachmentCollection;
use RT::Model::ScripCollection;
@@ -462,14 +462,14 @@
If $args{'type'} is set to C<text/html>, plain texts are upgraded to HTML.
Otherwise, HTML texts are downgraded to plain text. If $args{'type'} is
-missing, it defaults to the value of C<$RT::Transaction::PreferredContentType>.
+missing, it defaults to the value of C<$RT::Transaction::Preferredcontent_type>.
=cut
sub content {
my $self = shift;
my %args = (
- type => $PreferredContentType || 'text/plain',
+ type => $Preferredcontent_type || 'text/plain',
Quote => 0,
Wrap => 70,
@_
@@ -579,7 +579,7 @@
elsif ( $Attachment->content_type =~ '^multipart/' ) {
my $plain_parts = $Attachment->children;
$plain_parts->content_type(
- value => ( $PreferredContentType || 'text/plain' ) );
+ value => ( $Preferredcontent_type || 'text/plain' ) );
$plain_parts->limit_not_empty;
# If we actully found a part, return its content
@@ -626,7 +626,7 @@
Returns all the RT::Model::Attachment objects which are attached
to this transaction. Takes an optional parameter, which is
-a ContentType that Attachments should be restricted to.
+a content_type that Attachments should be restricted to.
=cut
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm Mon Jan 28 22:52:22 2008
@@ -266,7 +266,7 @@
unless ($ac_id) {
Jifty->log->fatal(
- "Could not add user to privileged or Unprivileged group on user creation. Aborted"
+ "Could not add user to privileged or Unprivileged group on user creation. aborted"
);
Jifty->log->fatal($ac_msg);
Jifty->handle->rollback();
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Record.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Record.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Record.pm Mon Jan 28 22:52:22 2008
@@ -680,7 +680,7 @@
sub _decode_lob {
my $self = shift;
- my $ContentType = shift || '';
+ my $content_type = shift || '';
my $ContentEncoding = shift || 'none';
my $Content = shift;
@@ -691,7 +691,7 @@
} elsif ( $ContentEncoding && $ContentEncoding ne 'none' ) {
return ( _( "Unknown ContentEncoding %1", $ContentEncoding ) );
}
- if ( RT::I18N::is_textual_content_type($ContentType) ) {
+ if ( RT::I18N::is_textual_content_type($content_type) ) {
$Content = Encode::decode_utf8($Content)
unless Encode::is_utf8($Content);
}
@@ -1396,7 +1396,7 @@
Field => undef,
Value => undef,
LargeContent => undef,
- ContentType => undef,
+ content_type => undef,
record_transaction => 1,
@_
);
@@ -1514,7 +1514,7 @@
Object => $self,
Content => $args{'Value'},
LargeContent => $args{'LargeContent'},
- ContentType => $args{'ContentType'},
+ content_type => $args{'content_type'},
);
unless ($new_value_id) {
@@ -1565,7 +1565,7 @@
Object => $self,
Content => $args{'Value'},
LargeContent => $args{'LargeContent'},
- ContentType => $args{'ContentType'},
+ content_type => $args{'content_type'},
);
unless ($new_value_id) {
Modified: rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/CreateTickets.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/CreateTickets.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/CreateTickets.pm Mon Jan 28 22:52:22 2008
@@ -211,7 +211,7 @@
within a template after a Content: header is treated
as content until we hit a line containing only
ENDOFCONTENT
- ContentType => the content-type of the Content field. Defaults to
+ content_type => the content-type of the Content field. Defaults to
'text/plain'
UpdateType => 'correspond' or 'comment'; used in conjunction with
'content' if this is an update. Defaults to
Modified: rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm Mon Jan 28 22:52:22 2008
@@ -310,7 +310,7 @@
. $self->scrip_obj->id . " "
. ( $self->scrip_obj->description || '' ) );
- my $status = RT::Interface::Email::SendEmail(
+ my $status = RT::Interface::Email::send_email(
Entity => $MIMEObj,
Ticket => $self->ticket_obj,
Transaction => $self->transaction_obj,
Modified: rt/branches/3.999-DANGEROUS/share/po/cs.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/cs.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/cs.po Mon Jan 28 22:52:22 2008
@@ -545,7 +545,7 @@
msgstr "AND"
#: NOT FOUND IN SOURCE
-msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgid "aborting to avoid unintended ticket modifications.\\n"
msgstr "Přerušeno k zamezení nežádoucích změn požadavku.\\n"
#: html/User/Elements/Tabs:53
@@ -3409,11 +3409,11 @@
msgstr "Žádný vzor"
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket "
+msgid "No Ticket specified. aborting ticket "
msgstr "Neudán požadavek. Přerušuje se požadavek "
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgid "No Ticket specified. aborting ticket modifications\\n\\n"
msgstr "Neudán požadavek. Přerušují se úpravy požadavku\\n\\n"
#: html/Approvals/Elements/Approve:77
Modified: rt/branches/3.999-DANGEROUS/share/po/da.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/da.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/da.po Mon Jan 28 22:52:22 2008
@@ -603,7 +603,7 @@
msgstr "OG"
#: NOT FOUND IN SOURCE
-msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgid "aborting to avoid unintended ticket modifications.\\n"
msgstr "Afbryder for at undgå utilsigtede sagsændringer.\\n"
#: html/User/Elements/Tabs:53
@@ -3826,12 +3826,12 @@
msgstr "Ingen skabelon"
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket "
+msgid "No Ticket specified. aborting ticket "
msgstr "Ingen sag angivet. Afbryder sag."
#: NOT FOUND IN SOURCE
msgid ""
-"No Ticket specified. Aborting ticket modifications\\n"
+"No Ticket specified. aborting ticket modifications\\n"
"\\n"
msgstr ""
"Ingen sag angivet. Afbryder sagsændringer\\n"
Modified: rt/branches/3.999-DANGEROUS/share/po/es.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/es.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/es.po Mon Jan 28 22:52:22 2008
@@ -597,8 +597,8 @@
msgstr "Y"
#: NOT FOUND IN SOURCE
-msgid "Aborting to avoid unintended ticket modifications.\\n"
-msgstr "Abortando para prevenir modificaciones no intencionadas al ticket\\n"
+msgid "aborting to avoid unintended ticket modifications.\\n"
+msgstr "abortando para prevenir modificaciones no intencionadas al ticket\\n"
#: html/User/Elements/Tabs:53
msgid "About me"
@@ -3623,12 +3623,12 @@
msgstr "No hay plantilla"
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket "
-msgstr "No se especificó el ticket. Abortada la transacción"
+msgid "No Ticket specified. aborting ticket "
+msgstr "No se especificó el ticket. abortada la transacción"
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
-msgstr "No se especificó ticket. Abortando las modificaciones al ticket\\n\\n"
+msgid "No Ticket specified. aborting ticket modifications\\n\\n"
+msgstr "No se especificó ticket. abortando las modificaciones al ticket\\n\\n"
#: html/Approvals/Elements/Approve:77
msgid "No action"
Modified: rt/branches/3.999-DANGEROUS/share/po/fi.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/fi.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/fi.po Mon Jan 28 22:52:22 2008
@@ -562,7 +562,7 @@
msgstr ""
#: NOT FOUND IN SOURCE
-msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgid "aborting to avoid unintended ticket modifications.\\n"
msgstr "Peruutetaan tarkoittamattomien tapausmuutosten välttämiseksi.\\n"
#: html/User/Elements/Tabs:53
@@ -3433,11 +3433,11 @@
msgstr "Ei pohjaa"
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket "
+msgid "No Ticket specified. aborting ticket "
msgstr "Tapausta ei määritelty. Perutaan tapaus "
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgid "No Ticket specified. aborting ticket modifications\\n\\n"
msgstr "Tapausta ei määritelty. Poistutaan tapauksen muokkauksesta\\n\\n"
#: html/Approvals/Elements/Approve:77
Modified: rt/branches/3.999-DANGEROUS/share/po/id.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/id.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/id.po Mon Jan 28 22:52:22 2008
@@ -474,7 +474,7 @@
msgstr "DAN"
#: NOT FOUND IN SOURCE
-msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgid "aborting to avoid unintended ticket modifications.\\n"
msgstr "Dibatalkan untuk menghindari modifikasi tiket yang tidak diharapkan.\\n"
#: html/User/Elements/Tabs:53
@@ -3045,7 +3045,7 @@
msgstr "Tidak ada Template"
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket "
+msgid "No Ticket specified. aborting ticket "
msgstr "Tidak ada Tiket yang ditentukan. Batalkan tiket "
#: html/Approvals/Elements/Approve:77
Modified: rt/branches/3.999-DANGEROUS/share/po/it.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/it.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/it.po Mon Jan 28 22:52:22 2008
@@ -601,7 +601,7 @@
msgstr ""
#: NOT FOUND IN SOURCE
-msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgid "aborting to avoid unintended ticket modifications.\\n"
msgstr "Interruzione per evitare modifiche di ticket involontarie.\\n"
#: html/User/Elements/Tabs:53
@@ -3716,7 +3716,7 @@
msgstr "Nessun Modello"
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket "
+msgid "No Ticket specified. aborting ticket "
msgstr "Nessun ticket specificato. Annullo il ticket"
#: html/Approvals/Elements/Approve:77
Modified: rt/branches/3.999-DANGEROUS/share/po/ja.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/ja.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/ja.po Mon Jan 28 22:52:22 2008
@@ -524,7 +524,7 @@
msgstr ""
#: NOT FOUND IN SOURCE
-msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgid "aborting to avoid unintended ticket modifications.\\n"
msgstr "意図的でないチケットの修正を防ぐために強制終了します。\\n"
#: html/User/Elements/Tabs:53
@@ -3265,11 +3265,11 @@
msgstr "テンプレートがありません"
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket "
+msgid "No Ticket specified. aborting ticket "
msgstr "チケットが指定されていません。"
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgid "No Ticket specified. aborting ticket modifications\\n\\n"
msgstr "チケットが指定されていません。チケットの修正を終了します\\n\\n"
#: html/Approvals/Elements/Approve:77
Modified: rt/branches/3.999-DANGEROUS/share/po/nl.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/nl.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/nl.po Mon Jan 28 22:52:22 2008
@@ -540,7 +540,7 @@
msgstr ""
#: NOT FOUND IN SOURCE
-msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgid "aborting to avoid unintended ticket modifications.\\n"
msgstr "Afbraak om ongewenste ticket aanpassing te voorkomen.\\n"
#: html/User/Elements/Tabs:53
@@ -3435,11 +3435,11 @@
msgstr "Geen Sjabloon"
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket "
+msgid "No Ticket specified. aborting ticket "
msgstr "Geen ticket gespecificeerd. Ticket afgebroken "
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgid "No Ticket specified. aborting ticket modifications\\n\\n"
msgstr "Geen ticket gespecificeerd. Ticket wijzigingen afgebroken\\n\\n"
#: html/Approvals/Elements/Approve:77
Modified: rt/branches/3.999-DANGEROUS/share/po/no.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/no.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/no.po Mon Jan 28 22:52:22 2008
@@ -605,7 +605,7 @@
msgstr ""
#: NOT FOUND IN SOURCE
-msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgid "aborting to avoid unintended ticket modifications.\\n"
msgstr "Avbryter for å ungå uånsket saksendring"
#: html/User/Elements/Tabs:53
@@ -3668,11 +3668,11 @@
msgstr "Ingen Mal"
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket "
+msgid "No Ticket specified. aborting ticket "
msgstr "Ingen sak oppgitt. Avbryter sak "
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgid "No Ticket specified. aborting ticket modifications\\n\\n"
msgstr "Ingen Sak oppgitt. Avbryter saksendring\\n\\n"
#: html/Approvals/Elements/Approve:77
Modified: rt/branches/3.999-DANGEROUS/share/po/pl.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/pl.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/pl.po Mon Jan 28 22:52:22 2008
@@ -599,7 +599,7 @@
msgstr ""
#: NOT FOUND IN SOURCE
-msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgid "aborting to avoid unintended ticket modifications.\\n"
msgstr "Przerwanie operacji, aby uniknąć niezamierzonych modyfikacji zgłoszenia.\\n"
#: html/User/Elements/Tabs:53
Modified: rt/branches/3.999-DANGEROUS/share/po/pt_br.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/pt_br.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/pt_br.po Mon Jan 28 22:52:22 2008
@@ -597,8 +597,8 @@
msgstr ""
#: NOT FOUND IN SOURCE
-msgid "Aborting to avoid unintended ticket modifications.\\n"
-msgstr "Abortando para evitar modificações indesejadas no tíquete.\\n"
+msgid "aborting to avoid unintended ticket modifications.\\n"
+msgstr "abortando para evitar modificações indesejadas no tíquete.\\n"
#: html/User/Elements/Tabs:53
msgid "About me"
@@ -3648,12 +3648,12 @@
msgstr "Não há Modelo"
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket "
-msgstr "Não há Tíquete especificado. Abortando o tíquete "
+msgid "No Ticket specified. aborting ticket "
+msgstr "Não há Tíquete especificado. abortando o tíquete "
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
-msgstr "Não há Tíquete especificado. Abortando modificações no tíquete\\n\\n"
+msgid "No Ticket specified. aborting ticket modifications\\n\\n"
+msgstr "Não há Tíquete especificado. abortando modificações no tíquete\\n\\n"
#: html/Approvals/Elements/Approve:77
msgid "No action"
Modified: rt/branches/3.999-DANGEROUS/share/po/ru.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/ru.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/ru.po Mon Jan 28 22:52:22 2008
@@ -610,7 +610,7 @@
msgstr "И"
#: NOT FOUND IN SOURCE
-msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgid "aborting to avoid unintended ticket modifications.\\n"
msgstr "Прекращаем работу во избежание нежелательного изменения заявки.\\n"
#: html/User/Elements/Tabs:53
@@ -3742,11 +3742,11 @@
msgstr "Нет шаблона"
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket "
+msgid "No Ticket specified. aborting ticket "
msgstr "Заявка не указана. Отмена."
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgid "No Ticket specified. aborting ticket modifications\\n\\n"
msgstr "Заявка не указана. Отменяем изменения заявки\\n\\n"
#: html/Approvals/Elements/Approve:77
Modified: rt/branches/3.999-DANGEROUS/share/po/zh_cn.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/zh_cn.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/zh_cn.po Mon Jan 28 22:52:22 2008
@@ -656,7 +656,7 @@
msgstr ""
#: NOT FOUND IN SOURCE
-msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgid "aborting to avoid unintended ticket modifications.\\n"
msgstr "离开以免不小心更改到申请单。\\n"
#: NOT FOUND IN SOURCE
@@ -4731,11 +4731,11 @@
msgstr "没有模板"
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket "
+msgid "No Ticket specified. aborting ticket "
msgstr "未指定申请单。退出申请单 "
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgid "No Ticket specified. aborting ticket modifications\\n\\n"
msgstr "未指定申请单。退出申请单更改\\n\\n"
#: NOT FOUND IN SOURCE
Modified: rt/branches/3.999-DANGEROUS/share/po/zh_tw.po
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/po/zh_tw.po (original)
+++ rt/branches/3.999-DANGEROUS/share/po/zh_tw.po Mon Jan 28 22:52:22 2008
@@ -656,7 +656,7 @@
msgstr ""
#: NOT FOUND IN SOURCE
-msgid "Aborting to avoid unintended ticket modifications.\\n"
+msgid "aborting to avoid unintended ticket modifications.\\n"
msgstr "離開以免不小心更改到申請單。\\n"
#: NOT FOUND IN SOURCE
@@ -4731,11 +4731,11 @@
msgstr "沒有範本"
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket "
+msgid "No Ticket specified. aborting ticket "
msgstr "未指定申請單。退出申請單 "
#: NOT FOUND IN SOURCE
-msgid "No Ticket specified. Aborting ticket modifications\\n\\n"
+msgid "No Ticket specified. aborting ticket modifications\\n\\n"
msgstr "未指定申請單。退出申請單更改\\n\\n"
#: NOT FOUND IN SOURCE
Modified: rt/branches/3.999-DANGEROUS/t/clicky.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/clicky.t (original)
+++ rt/branches/3.999-DANGEROUS/t/clicky.t Mon Jan 28 22:52:22 2008
@@ -21,7 +21,7 @@
my $CurrentUser = RT->system_user;
my $queue = RT::Model::Queue->new($CurrentUser);
-$queue->load('General') || Abort(_("Queue could not be loaded."));
+$queue->load('General') || abort(_("Queue could not be loaded."));
my $message = MIME::Entity->build(
Subject => 'test',
Modified: rt/branches/3.999-DANGEROUS/t/mail/gateway.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/mail/gateway.t (original)
+++ rt/branches/3.999-DANGEROUS/t/mail/gateway.t Mon Jan 28 22:52:22 2008
@@ -487,7 +487,7 @@
# Verify that the binary attachment is valid in the database
my $attachments = RT::Model::AttachmentCollection->new(current_user => RT->system_user);
- $attachments->limit(column => 'ContentType', value => 'image/gif');
+ $attachments->limit(column => 'content_type', value => 'image/gif');
my $txn_alias = $attachments->join(
alias1 => 'main',
column1 => 'TransactionId',
Modified: rt/branches/3.999-DANGEROUS/t/ticket/link_search.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/ticket/link_search.t (original)
+++ rt/branches/3.999-DANGEROUS/t/ticket/link_search.t Mon Jan 28 22:52:22 2008
@@ -13,7 +13,7 @@
my $CurrentUser = RT->system_user;
my $queue = RT::Model::Queue->new(current_user => $CurrentUser);
-$queue->load('General') || Abort(_("Queue could not be loaded."));
+$queue->load('General') || abort(_("Queue could not be loaded."));
my $child_ticket = RT::Model::Ticket->new(current_user => $CurrentUser );
my ($childid) = $child_ticket->create(
Modified: rt/branches/3.999-DANGEROUS/t/web/command_line.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/command_line.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/command_line.t Mon Jan 28 22:52:22 2008
@@ -212,7 +212,7 @@
my $attachment_type = $2;
ok($attachment_id, "Got attachment id=$attachment_id $attachment_type");
expect_send("show ticket/$ticket_id/attachments/$attachment_id", "Showing attachment $attachment_id...");
-expect_like(qr/ContentType: $attachment_type/, 'Got the attachment');
+expect_like(qr/content_type: $attachment_type/, 'Got the attachment');
# }}}
More information about the Rt-commit
mailing list