| 1 |
snetram |
1.2 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-ibays-1.2.0/root/etc/e-smith/db/configuration/defaults/maxIbayNameLength/type.maxIbaysNameLength.patch mezzanine_patched_e-smith-ibays-1.2.0/root/etc/e-smith/db/configuration/defaults/maxIbayNameLength.maxIbaysNameLength.patch |
| 2 |
|
|
--- e-smith-ibays-1.2.0/root/etc/e-smith/db/configuration/defaults/maxIbayNameLength.maxIbaysNameLength/type.patch 1970-01-01 01:00:00.000000000 +0100 |
| 3 |
|
|
+++ mezzanine_patched_e-smith-ibays-1.2.0/root/etc/e-smith/db/configuration/defaults/maxIbayNameLength/type 2008-04-17 23:37:17.000000000 +0200 |
| 4 |
slords |
1.1 |
@@ -0,0 +1 @@ |
| 5 |
|
|
+12 |
| 6 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-ibays-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibays.pm mezzanine_patched_e-smith-ibays-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibays.pm |
| 7 |
|
|
--- e-smith-ibays-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibays.pm 2008-04-17 23:50:09.000000000 +0200 |
| 8 |
|
|
+++ mezzanine_patched_e-smith-ibays-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/ibays.pm 2008-04-17 23:49:35.000000000 +0200 |
| 9 |
|
|
@@ -89,7 +89,6 @@ |
| 10 |
|
|
my $class = ref($proto) || $proto; |
| 11 |
|
|
my $self = esmith::FormMagick::new($class); |
| 12 |
|
|
$self->{calling_package} = (caller)[0]; |
| 13 |
|
|
- $self->{defaultMaxLength} = 12; |
| 14 |
|
|
|
| 15 |
|
|
return $self; |
| 16 |
|
|
} |
| 17 |
|
|
@@ -220,7 +219,6 @@ |
| 18 |
|
|
my $in = $self->{cgi}->param('name') || ''; |
| 19 |
|
|
my $action = $self->{cgi}->param('action') || ''; |
| 20 |
|
|
my $maxLength = $configdb->get('maxIbayNameLength'); |
| 21 |
|
|
- $maxLength = $maxLength ? $maxLength->value : $self->{defaultMaxLength}; |
| 22 |
|
|
print qq(<tr><td colspan="2">) . $self->localise('NAME_FIELD_DESC', |
| 23 |
|
|
{maxLength => $maxLength}) . qq(</td></tr>); |
| 24 |
|
|
print qq(<tr><td class="sme-noborders-label">) . |
| 25 |
|
|
@@ -373,7 +371,7 @@ |
| 26 |
|
|
|
| 27 |
|
|
Checks the length of a given i-bay name against the maximum set in the |
| 28 |
|
|
maxIbayNameLength record of the configuration database. Defaults to a |
| 29 |
|
|
-maximum length of $self->{defaultMaxLength} if nothing is set in the config db. |
| 30 |
|
|
+maximum length of the maxIbayNameLength set in the config db. |
| 31 |
|
|
|
| 32 |
|
|
=begin testing |
| 33 |
|
|
|
| 34 |
|
|
@@ -401,12 +399,7 @@ |
| 35 |
|
|
sub max_ibay_name_length { |
| 36 |
|
|
my ($self, $data) = @_; |
| 37 |
|
|
$configdb->reload(); |
| 38 |
|
|
- my $max; |
| 39 |
|
|
- if (my $max_record = $configdb->get('maxIbayNameLength')) { |
| 40 |
|
|
- $max = $max_record->value(); |
| 41 |
|
|
- } else { |
| 42 |
|
|
- $max = $self->{defaultMaxLength}; |
| 43 |
|
|
- } |
| 44 |
slords |
1.3 |
+ my $max = $configdb->get('maxIbayNameLength'); |
| 45 |
slords |
1.1 |
|
| 46 |
|
|
if (length($data) <= $max) { |
| 47 |
|
|
return "OK"; |
| 48 |
|
|
|
Parent Directory
| 
Revision Log
| 
Revision Graph
