[Rt-commit] rt branch, 4.4/default-values, repushed
? sunnavy
sunnavy at bestpractical.com
Thu Sep 4 12:14:14 EDT 2014
The branch 4.4/default-values was deleted and repushed:
was e567a94744925deabd5a031fd239f4ca8a2715af
now 7d87a78217366619dacfa0a50b49170fb8963d47
1: afd5b61 = 1: afd5b61 make datepicker less zealous
2: 1022a16 ! 2: 0bb6abb system level cf default values support
@@ -60,31 +60,28 @@
+ $old_content = $attr->Content;
+ $old_values = $old_content->{ $self->id };
+ }
-+
+
+ if ( defined $old_values && length $old_values ) {
+ $old_values = join ', ', @$old_values if ref $old_values eq 'ARRAY';
+ }
-+ else {
-+ $old_values = $self->loc('(no value)');
-+ }
-+
+
+ $new_values = $args{Values};
+ if ( defined $new_values && length $new_values ) {
+ $new_values = join ', ', @$new_values if ref $new_values eq 'ARRAY';
+ }
-+ else {
-+ $new_values = $self->loc( '(no value)' );
-+ }
-+
-+ return 1 if $new_values eq $old_values;
-
+
++ return 1 if ( $new_values // '' ) eq ( $old_values // '' );
++
+ my ($ret, $msg) = $args{Object}->SetAttribute(
+ Name => 'CustomFieldDefaultValues',
+ Content => {
+ %{ $old_content || {} }, $self->id => $args{Values},
+ },
+ );
-
++
++ $old_values = $self->loc('(no value)') unless defined $old_values && length $old_values;
++ $new_values = $self->loc( '(no value)' ) unless defined $new_values && length $new_values;
++
+ if ( $ret ) {
+ return ( $ret, $self->loc( 'Default values changed from [_1] to [_2]', $old_values, $new_values ) );
+ }
@@ -92,7 +89,7 @@
+ return ( $ret, $self->loc( "Can't change default values from [_1] to [_2]: [_3]", $old_values, $new_values, $msg ) );
+ }
+}
-
++
+sub CleanupDefaultValues {
+ my $self = shift;
+ my $attrs = RT::Attributes->new( $self->CurrentUser );
3: d2a07fc ! 3: 7f9f5a1 queue level cf default values support
@@ -12,7 +12,7 @@
+sub ObjectHasCustomFieldGrouping {
+ my $self = shift;
+ my %args = ( Object => undef, Grouping => undef, @_ );
-+ my $object_type = ref $args{Object};
++ my $object_type = RT::CustomField->_GroupingClass($args{Object});
+ my $groupings = RT->Config->Get( 'CustomFieldGroupings' );
+ return 0 unless $groupings;
+ return 1 if $groupings->{$object_type} && grep { $_ eq $args{Grouping} } @{ $groupings->{$object_type} };
4: b729b61 = 4: 4376332 clear caches after each web request for tests(thanks to chmrr++)
5: f5952d0 ! 5: 6b37a8a no need to clear these caches explicitly
@@ -3,7 +3,7 @@
no need to clear these caches explicitly
because they are automatically cleared(after web requests).
- see also 2c2506e
+ see also 4376332
diff --git a/t/web/dashboards-basics.t b/t/web/dashboards-basics.t
--- a/t/web/dashboards-basics.t
6: 1d926af = 6: 5971ba1 queue-level default values for priority/due
7: e567a94 = 7: 7d87a78 queue level default value for Starts
More information about the rt-commit
mailing list