Ignore:
Timestamp:
04/07/15 16:42:39 (9 years ago)
Author:
nanardon
Message:

merge changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Objects.pm

    r1306 r1315  
    370370            return; 
    371371        }; 
    372         $attribute->mandatory && 
    373             (!(defined($cdata{$cfield})) || $cdata{$cfield} eq '') and do { 
     372 
     373        if (!$attribute->checkinput($cdata{$cfield})) { 
    374374            $self->base->log(LA_ERR, 
    375                 "%s attribute cannot be empty, ignoring for object %s/%s", 
    376                 $cfield, 
    377                         $self->type, 
    378                         $self->id, 
     375                "Value for attribute %s to %s (%s) does not match requirements", 
     376                $cfield, $self->id, $self->type 
    379377            ); 
    380             return 0; 
     378            return; 
    381379        }; 
    382380    } 
Note: See TracChangeset for help on using the changeset viewer.