diff options
Diffstat (limited to 'rt')
| -rw-r--r-- | rt/FREESIDE_MODIFIED | 3 | ||||
| -rwxr-xr-x | rt/etc/schema.mysql-4.1 | 1 | ||||
| -rw-r--r-- | rt/lib/RT/Tickets_Overlay.pm | 8 | ||||
| -rw-r--r-- | rt/share/html/Admin/CustomFields/Modify.html | 10 | ||||
| -rw-r--r-- | rt/share/html/Elements/AddCustomers | 5 | ||||
| -rw-r--r-- | rt/share/html/Ticket/Elements/AddCustomers | 5 |
6 files changed, 5 insertions, 27 deletions
diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED index 45a61062e..d73a5e055 100644 --- a/rt/FREESIDE_MODIFIED +++ b/rt/FREESIDE_MODIFIED @@ -5,10 +5,9 @@ config.layout.in etc/RT_Config.pm etc/RT_SiteConfig.pm etc/schema.Pg - etc/schema.mysql-4.1 lib/RT/Config.pm -lib/RT/CustomField.pm #CheckMandatoryFields +lib/RT?CustomField.pm #CheckMandatoryFields lib/RT/CustomField_Overlay.pm #customfield date patch lib/RT/Interface/Web.pm #customfield date patch lib/RT/Interface/Web_Vendor.pm diff --git a/rt/etc/schema.mysql-4.1 b/rt/etc/schema.mysql-4.1 index 173570219..172e477c1 100755 --- a/rt/etc/schema.mysql-4.1 +++ b/rt/etc/schema.mysql-4.1 @@ -386,7 +386,6 @@ CREATE TABLE CustomFields ( LastUpdatedBy integer NOT NULL DEFAULT 0 , LastUpdated DATETIME NULL , Disabled int2 NOT NULL DEFAULT 0 , - Required int2 NOT NULL DEFAULT 0 , PRIMARY KEY (id) ) TYPE=InnoDB CHARACTER SET utf8; diff --git a/rt/lib/RT/Tickets_Overlay.pm b/rt/lib/RT/Tickets_Overlay.pm index be5a0d5fb..f2949ed7a 100644 --- a/rt/lib/RT/Tickets_Overlay.pm +++ b/rt/lib/RT/Tickets_Overlay.pm @@ -1855,13 +1855,7 @@ sub OrderByCols { ); #if there was a Links.RemoteTarget int, this bs wouldn't be necessary - my $custnum_sql = "CAST(SUBSTR($linkalias.Target,31) AS "; - if ( RT->Config->Get('DatabaseType') eq 'mysql' ) { - $custnum_sql .= 'SIGNED INTEGER)'; - } - else { - $custnum_sql .= 'INTEGER)'; - } + my $custnum_sql = "CAST(SUBSTR($linkalias.Target,31) AS INTEGER)"; if ( $subkey eq 'Number' ) { diff --git a/rt/share/html/Admin/CustomFields/Modify.html b/rt/share/html/Admin/CustomFields/Modify.html index fc2c49d59..d2932d2d9 100644 --- a/rt/share/html/Admin/CustomFields/Modify.html +++ b/rt/share/html/Admin/CustomFields/Modify.html @@ -199,15 +199,6 @@ if ( $ARGS{'Update'} && $id ne 'new' ) { push (@results, $msg); } - # Clean up values - foreach my $param (grep /^$paramtag-/, keys(%ARGS)) { - for ($ARGS{$param}) { - s/\r+\n/\n/g; - s/^\s+//; - s/\s+$//; - } - } - # Update any existing values my $values = $CustomFieldObj->ValuesObj; while ( my $value = $values->Next ) { @@ -215,6 +206,7 @@ if ( $ARGS{'Update'} && $id ne 'new' ) { my $param = join("-", $paramtag, $value->Id, $attr); next unless exists $ARGS{$param}; next if ($value->$attr()||'') eq ($ARGS{$param}||''); + my $mutator = "Set$attr"; my ($id, $msg) = $value->$mutator( $ARGS{$param} ); push (@results, $msg); diff --git a/rt/share/html/Elements/AddCustomers b/rt/share/html/Elements/AddCustomers index 9828d7d53..aaf8ca8ba 100644 --- a/rt/share/html/Elements/AddCustomers +++ b/rt/share/html/Elements/AddCustomers @@ -39,10 +39,7 @@ warn "/Elements/AddCustomers called with CustomerString $CustomerString\n" my @Customers = (); if ( $CustomerString ) { - @Customers = &RT::URI::freeside::smart_search( - 'search' => $CustomerString, - 'no_fuzzy_on_exact' => 1, #pref? - ); + @Customers = &RT::URI::freeside::smart_search( 'search' => $CustomerString ); } my @Services = (); diff --git a/rt/share/html/Ticket/Elements/AddCustomers b/rt/share/html/Ticket/Elements/AddCustomers index 09acdfd3f..e04c07702 100644 --- a/rt/share/html/Ticket/Elements/AddCustomers +++ b/rt/share/html/Ticket/Elements/AddCustomers @@ -36,10 +36,7 @@ my $freeside_url = &RT::URI::freeside::FreesideURL(); my @Customers = (); if ( $CustomerString ) { - @Customers = &RT::URI::freeside::smart_search( - 'search' => $CustomerString, - 'no_fuzzy_on_exact' => 1, #pref? - ); + @Customers = &RT::URI::freeside::smart_search( 'search' => $CustomerString ); } my @Services = (); |