[Rt-commit] rt branch, 3.999-trunk, updated. 77677e0d14a16a8e38041071d5e82ef1d5a33ec3

[sunnavy at bestpractical.com]

The branch, 3.999-trunk has been updated
       via  77677e0d14a16a8e38041071d5e82ef1d5a33ec3 (commit)
       via  25eb33e9ac007b14fc880a42a0a6c40df350f51e (commit)
       via  0d7ee5962746995f6820eb10360e58ddc035b9a2 (commit)
      from  db86191ec66d3ca6ae99e50806852f76ec0332e5 (commit)

Summary of changes:
 lib/RT/Model/ObjectCustomField.pm           |    2 +-
 lib/RT/Model/ObjectCustomFieldCollection.pm |    2 +-
 share/html/Admin/Elements/EditCustomFields  |    4 ++--
 share/html/Elements/SelectCustomFieldValue  |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit 0d7ee5962746995f6820eb10360e58ddc035b9a2
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue Nov 10 10:16:39 2009 +0800

    small case fix

diff --git a/share/html/Admin/Elements/EditCustomFields b/share/html/Admin/Elements/EditCustomFields
index bf3db1d..a979407 100755
--- a/share/html/Admin/Elements/EditCustomFields
+++ b/share/html/Admin/Elements/EditCustomFields
@@ -107,7 +107,7 @@ if (grep $_ > 1, values %sort_orders) {
 # {{{ deal with moving sort_order of custom fields
 if ($custom_field and $move) {
     my $SourceObj = RT::Model::ObjectCustomField->new( current_user => Jifty->web->current_user );
-    $SourceObj->load_by_cols( object_id => $id, CustomField => $custom_field );
+    $SourceObj->load_by_cols( object_id => $id, custom_field => $custom_field );
 
     my $targetObj;
     my $target_order = $SourceObj->sort_order + $move;
diff --git a/share/html/Elements/SelectCustomFieldValue b/share/html/Elements/SelectCustomFieldValue
index 4bc18f2..d1a9584 100755
--- a/share/html/Elements/SelectCustomFieldValue
+++ b/share/html/Elements/SelectCustomFieldValue
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %# 
 %# END BPS TAGGED BLOCK }}}
-% $m->callback( name => $name, CustomField => $custom_field );
+% $m->callback( name => $name, custom_field => $custom_field );
 % if ($custom_field->type =~ /Select/i) {
 % my $values = $custom_field->values;
 <select name="<%$name%>">

commit 25eb33e9ac007b14fc880a42a0a6c40df350f51e
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue Nov 10 10:16:55 2009 +0800

    warning fix

diff --git a/share/html/Admin/Elements/EditCustomFields b/share/html/Admin/Elements/EditCustomFields
index a979407..ad7f202 100755
--- a/share/html/Admin/Elements/EditCustomFields
+++ b/share/html/Admin/Elements/EditCustomFields
@@ -71,7 +71,7 @@ my $CustomFields = RT::Model::CustomFieldCollection->new( current_user => Jifty-
 my @results;
 my (@GlobalCFs, @UnassignedCFs);
 
-my $id = $object->id;
+my $id = $object->id || '';
 if ($id and !$object->current_user_has_right('AssignCustomFields')) {
     $m->out('<p><i>', _('(No custom fields)'), '</i></p>');
     return;

commit 77677e0d14a16a8e38041071d5e82ef1d5a33ec3
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue Nov 10 10:17:50 2009 +0800

    ObjectCustomField->custom_field is an object, not id

diff --git a/lib/RT/Model/ObjectCustomField.pm b/lib/RT/Model/ObjectCustomField.pm
index d51203b..a1ce9ce 100644
--- a/lib/RT/Model/ObjectCustomField.pm
+++ b/lib/RT/Model/ObjectCustomField.pm
@@ -133,7 +133,7 @@ sub delete {
 
 sub custom_field_obj {
     my $self = shift;
-    my $id   = shift || $self->custom_field;
+    my $id   = shift || $self->custom_field->id;
     my $CF   = RT::Model::CustomField->new( current_user => $self->current_user );
     $CF->load($id);
     return $CF;
diff --git a/lib/RT/Model/ObjectCustomFieldCollection.pm b/lib/RT/Model/ObjectCustomFieldCollection.pm
index 1559908..a10dfcd 100644
--- a/lib/RT/Model/ObjectCustomFieldCollection.pm
+++ b/lib/RT/Model/ObjectCustomFieldCollection.pm
@@ -85,7 +85,7 @@ sub has_entry_for_custom_field {
     my $self = shift;
     my $id   = shift;
 
-    my @items = grep { $_->custom_field == $id } @{ $self->items_array_ref };
+    my @items = grep { $_->custom_field->id == $id } @{ $self->items_array_ref };
 
     if ( $#items > 1 ) {
         die "$self HasEntry had a list with more than one of $id in it. this can never happen";

-----------------------------------------------------------------------