[Rt-commit] rt branch, 4.4/initial-custom-field, created. rt-4.4.0rc2-22-g3187416
Shawn Moore
shawn at bestpractical.com
Sun Dec 27 21:18:29 EST 2015
The branch, 4.4/initial-custom-field has been created
at 3187416335c2072a95cb54ae61e55acdc4549126 (commit)
- Log -----------------------------------------------------------------
commit 3187416335c2072a95cb54ae61e55acdc4549126
Author: Shawn M Moore <shawn at bestpractical.com>
Date: Mon Dec 28 02:12:21 2015 +0000
Add a new SetInitialCustomField right
This lets you set custom field values on records (tickets, assets,
articles) that you're creating. But it does not permit modifying the
custom field values of existing records.
Fixes: I#14974
diff --git a/lib/RT/Article.pm b/lib/RT/Article.pm
index 66c3b4c..88b01b5 100644
--- a/lib/RT/Article.pm
+++ b/lib/RT/Article.pm
@@ -147,7 +147,8 @@ sub Create {
: (Value => $value)
),
Field => $cf,
- RecordTransaction => 0
+ RecordTransaction => 0,
+ ForCreation => 1,
);
unless ($cfid) {
diff --git a/lib/RT/Asset.pm b/lib/RT/Asset.pm
index 2ebc56b..4effee1 100644
--- a/lib/RT/Asset.pm
+++ b/lib/RT/Asset.pm
@@ -293,7 +293,8 @@ sub Create {
? %$value
: (Value => $value)),
Field => $cf,
- RecordTransaction => 0
+ RecordTransaction => 0,
+ ForCreation => 1,
);
unless ($cfid) {
RT->DatabaseHandle->Rollback();
diff --git a/lib/RT/Catalog.pm b/lib/RT/Catalog.pm
index 66f613a..9efa948 100644
--- a/lib/RT/Catalog.pm
+++ b/lib/RT/Catalog.pm
@@ -83,8 +83,9 @@ __PACKAGE__->AddRight( General => ShowAsset => 'See assets' ); #loc
__PACKAGE__->AddRight( Staff => CreateAsset => 'Create assets' ); #loc
__PACKAGE__->AddRight( Staff => ModifyAsset => 'Modify assets' ); #loc
-__PACKAGE__->AddRight( General => SeeCustomField => 'View custom field values' ); # loc
-__PACKAGE__->AddRight( Staff => ModifyCustomField => 'Modify custom field values' ); # loc
+__PACKAGE__->AddRight( General => SeeCustomField => 'View custom field values' ); # loc
+__PACKAGE__->AddRight( Staff => ModifyCustomField => 'Modify custom field values' ); # loc
+__PACKAGE__->AddRight( Staff => SetInitialCustomField => 'Add custom field values only at asset creation time'); # loc
RT::ACE->RegisterCacheHandler(sub {
my %args = (
diff --git a/lib/RT/Class.pm b/lib/RT/Class.pm
index 04bd5a8..f70406e 100644
--- a/lib/RT/Class.pm
+++ b/lib/RT/Class.pm
@@ -84,19 +84,20 @@ sub Load {
}
}
-__PACKAGE__->AddRight( Staff => SeeClass => 'See that this class exists'); # loc
-__PACKAGE__->AddRight( Staff => CreateArticle => 'Create articles in this class'); # loc
-__PACKAGE__->AddRight( General => ShowArticle => 'See articles in this class'); # loc
-__PACKAGE__->AddRight( Staff => ShowArticleHistory => 'See changes to articles in this class'); # loc
-__PACKAGE__->AddRight( General => SeeCustomField => 'View custom field values' ); # loc
-__PACKAGE__->AddRight( Staff => ModifyArticle => 'Modify articles in this class'); # loc
-__PACKAGE__->AddRight( Staff => ModifyArticleTopics => 'Modify topics for articles in this class'); # loc
-__PACKAGE__->AddRight( Staff => ModifyCustomField => 'Modify custom field values' ); # loc
-__PACKAGE__->AddRight( Admin => AdminClass => 'Modify metadata and custom fields for this class'); # loc
-__PACKAGE__->AddRight( Admin => AdminTopics => 'Modify topic hierarchy associated with this class'); # loc
-__PACKAGE__->AddRight( Admin => ShowACL => 'Display Access Control List'); # loc
-__PACKAGE__->AddRight( Admin => ModifyACL => 'Create, modify and delete Access Control List entries'); # loc
-__PACKAGE__->AddRight( Staff => DisableArticle => 'Disable articles in this class'); # loc
+__PACKAGE__->AddRight( Staff => SeeClass => 'See that this class exists'); # loc
+__PACKAGE__->AddRight( Staff => CreateArticle => 'Create articles in this class'); # loc
+__PACKAGE__->AddRight( General => ShowArticle => 'See articles in this class'); # loc
+__PACKAGE__->AddRight( Staff => ShowArticleHistory => 'See changes to articles in this class'); # loc
+__PACKAGE__->AddRight( General => SeeCustomField => 'View custom field values' ); # loc
+__PACKAGE__->AddRight( Staff => ModifyArticle => 'Modify articles in this class'); # loc
+__PACKAGE__->AddRight( Staff => ModifyArticleTopics => 'Modify topics for articles in this class'); # loc
+__PACKAGE__->AddRight( Staff => ModifyCustomField => 'Modify custom field values' ); # loc
+__PACKAGE__->AddRight( Staff => SetInitialCustomField => 'Add custom field values only at article creation time'); # loc
+__PACKAGE__->AddRight( Admin => AdminClass => 'Modify metadata and custom fields for this class'); # loc
+__PACKAGE__->AddRight( Admin => AdminTopics => 'Modify topic hierarchy associated with this class'); # loc
+__PACKAGE__->AddRight( Admin => ShowACL => 'Display Access Control List'); # loc
+__PACKAGE__->AddRight( Admin => ModifyACL => 'Create, modify and delete Access Control List entries'); # loc
+__PACKAGE__->AddRight( Staff => DisableArticle => 'Disable articles in this class'); # loc
# {{{ Create
diff --git a/lib/RT/CustomField.pm b/lib/RT/CustomField.pm
index 1149d38..f0b7521 100644
--- a/lib/RT/CustomField.pm
+++ b/lib/RT/CustomField.pm
@@ -214,6 +214,7 @@ __PACKAGE__->AddRight( General => SeeCustomField => 'View custom fields'
__PACKAGE__->AddRight( Admin => AdminCustomField => 'Create, modify and delete custom fields'); # loc
__PACKAGE__->AddRight( Admin => AdminCustomFieldValues => 'Create, modify and delete custom fields values'); # loc
__PACKAGE__->AddRight( Staff => ModifyCustomField => 'Add, modify and delete custom field values for objects'); # loc
+__PACKAGE__->AddRight( Staff => SetInitialCustomField => 'Add custom field values only at object creation time'); # loc
=head1 NAME
@@ -1639,11 +1640,15 @@ sub AddValueForObject {
Content => undef,
LargeContent => undef,
ContentType => undef,
+ ForCreation => 0,
@_
);
my $obj = $args{'Object'} or return ( 0, $self->loc('Invalid object') );
- unless ( $self->CurrentUserHasRight('ModifyCustomField') ) {
+ unless (
+ $self->CurrentUserHasRight('ModifyCustomField') ||
+ ($args{ForCreation} && $self->CurrentUserHasRight('SetInitialCustomField'))
+ ) {
return ( 0, $self->loc('Permission Denied') );
}
diff --git a/lib/RT/Queue.pm b/lib/RT/Queue.pm
index 83e2b3b..6b63c06 100644
--- a/lib/RT/Queue.pm
+++ b/lib/RT/Queue.pm
@@ -100,16 +100,17 @@ use RT::CustomRoles;
use RT::ACL;
use RT::Interface::Email;
-__PACKAGE__->AddRight( General => SeeQueue => 'View queue' ); # loc
-__PACKAGE__->AddRight( Admin => AdminQueue => 'Create, modify and delete queue' ); # loc
-__PACKAGE__->AddRight( Admin => ShowACL => 'Display Access Control List' ); # loc
-__PACKAGE__->AddRight( Admin => ModifyACL => 'Create, modify and delete Access Control List entries' ); # loc
-__PACKAGE__->AddRight( Admin => ModifyQueueWatchers => 'Modify queue watchers' ); # loc
-__PACKAGE__->AddRight( General => SeeCustomField => 'View custom field values' ); # loc
-__PACKAGE__->AddRight( Staff => ModifyCustomField => 'Modify custom field values' ); # loc
-__PACKAGE__->AddRight( Admin => AssignCustomFields => 'Assign and remove queue custom fields' ); # loc
-__PACKAGE__->AddRight( Admin => ModifyTemplate => 'Modify Scrip templates' ); # loc
-__PACKAGE__->AddRight( Admin => ShowTemplate => 'View Scrip templates' ); # loc
+__PACKAGE__->AddRight( General => SeeQueue => 'View queue' ); # loc
+__PACKAGE__->AddRight( Admin => AdminQueue => 'Create, modify and delete queue' ); # loc
+__PACKAGE__->AddRight( Admin => ShowACL => 'Display Access Control List' ); # loc
+__PACKAGE__->AddRight( Admin => ModifyACL => 'Create, modify and delete Access Control List entries' ); # loc
+__PACKAGE__->AddRight( Admin => ModifyQueueWatchers => 'Modify queue watchers' ); # loc
+__PACKAGE__->AddRight( General => SeeCustomField => 'View custom field values' ); # loc
+__PACKAGE__->AddRight( Staff => ModifyCustomField => 'Modify custom field values' ); # loc
+__PACKAGE__->AddRight( Staff => SetInitialCustomField => 'Add custom field values only at ticket creation time'); # loc
+__PACKAGE__->AddRight( Admin => AssignCustomFields => 'Assign and remove queue custom fields' ); # loc
+__PACKAGE__->AddRight( Admin => ModifyTemplate => 'Modify Scrip templates' ); # loc
+__PACKAGE__->AddRight( Admin => ShowTemplate => 'View Scrip templates' ); # loc
__PACKAGE__->AddRight( Admin => ModifyScrips => 'Modify Scrips' ); # loc
__PACKAGE__->AddRight( Admin => ShowScrips => 'View Scrips' ); # loc
diff --git a/lib/RT/Record.pm b/lib/RT/Record.pm
index ae0262d..de03b30 100644
--- a/lib/RT/Record.pm
+++ b/lib/RT/Record.pm
@@ -1937,6 +1937,7 @@ sub _AddCustomFieldValue {
LargeContent => undef,
ContentType => undef,
RecordTransaction => 1,
+ ForCreation => 0,
@_
);
@@ -2015,6 +2016,7 @@ sub _AddCustomFieldValue {
Content => $args{'Value'},
LargeContent => $args{'LargeContent'},
ContentType => $args{'ContentType'},
+ ForCreation => $args{'ForCreation'},
);
unless ( $new_value_id ) {
diff --git a/lib/RT/Ticket.pm b/lib/RT/Ticket.pm
index a786a83..48728a2 100644
--- a/lib/RT/Ticket.pm
+++ b/lib/RT/Ticket.pm
@@ -502,6 +502,7 @@ sub Create {
),
Field => $cfid,
RecordTransaction => 0,
+ ForCreation => 1,
);
push @non_fatal_errors, $msg unless $status;
}
diff --git a/share/html/Articles/Article/Edit.html b/share/html/Articles/Article/Edit.html
index 8f3b923..b67043a 100644
--- a/share/html/Articles/Article/Edit.html
+++ b/share/html/Articles/Article/Edit.html
@@ -72,7 +72,8 @@
CFContent => \%CFContent,
ClassObj => $ClassObj,
%ARGS,
- id =>$id,
+ id => $id,
+ ForCreation => ($id eq 'new'),
&>
<tr>
diff --git a/share/html/Asset/Create.html b/share/html/Asset/Create.html
index 2b97d7c..498dcdf 100644
--- a/share/html/Asset/Create.html
+++ b/share/html/Asset/Create.html
@@ -94,7 +94,9 @@
Object => $asset,
TitleBoxARGS => { title_class => "inverse" },
KeepValue => 1,
- CustomFieldGenerator => sub { $catalog->AssetCustomFields } &>
+ CustomFieldGenerator => sub { $catalog->AssetCustomFields },
+ ForCreation => 1,
+ &>
</div>
<& /Elements/Submit, Label => loc('Create asset') &>
diff --git a/share/html/Elements/EditCustomFields b/share/html/Elements/EditCustomFields
index 3c7ba8c..4e96090 100644
--- a/share/html/Elements/EditCustomFields
+++ b/share/html/Elements/EditCustomFields
@@ -51,7 +51,8 @@
<<% $WRAP %> class="edit-custom-fields">
% }
% while ( my $CustomField = $CustomFields->Next ) {
-% next unless $CustomField->CurrentUserHasRight('ModifyCustomField');
+% next unless $CustomField->CurrentUserHasRight('ModifyCustomField')
+% || ($ForCreation && $CustomField->CurrentUserHasRight('SetInitialCustomField'));
% my $Type = $CustomField->Type || 'Unknown';
<<% $FIELD %> class="edit-custom-field cftype-<% $Type %>">
@@ -116,4 +117,5 @@ $Grouping => undef
$AsTable => 1
$InTable => 0
$ShowHints => 1
+$ForCreation => 0
</%ARGS>
diff --git a/share/html/Ticket/Create.html b/share/html/Ticket/Create.html
index 6881b62..63a8db6 100644
--- a/share/html/Ticket/Create.html
+++ b/share/html/Ticket/Create.html
@@ -121,6 +121,7 @@
CustomFields => $QueueObj->TicketCustomFields,
Grouping => 'Basics',
InTable => 1,
+ ForCreation => 1,
&>
<& /Ticket/Elements/EditTransactionCustomFields, %ARGS, QueueObj => $QueueObj, InTable => 1 &>
</table>
@@ -134,6 +135,7 @@
%ARGS,
Object => $ticket,
CustomFieldGenerator => sub { $QueueObj->TicketCustomFields },
+ ForCreation => 1,
&>
</div>
@@ -210,6 +212,7 @@
CustomFields => $QueueObj->TicketCustomFields,
Grouping => 'People',
InTable => 1,
+ ForCreation => 1,
&>
<tr>
@@ -304,6 +307,7 @@
CustomFields => $QueueObj->TicketCustomFields,
Grouping => 'Dates',
InTable => 1,
+ ForCreation => 1,
&>
</table>
</&>
-----------------------------------------------------------------------
More information about the rt-commit
mailing list