--- lib/A3C/Model/User.pm	2008/03/17 21:30:59	27
+++ lib/A3C/Model/User.pm	2008/03/18 19:22:30	33
@@ -22,15 +22,13 @@
 
 	column cn =>
 		label is _('Ime i prezime'),
-		is virtual;
+		is mandatory;
 
 	column sn =>
-		is virtual,
 		label is _('Prezime'),
 		is mandatory;
 
 	column givenName =>
-		is virtual,
 		label is _('Ime'),
 		is mandatory;
 
@@ -150,6 +148,10 @@
 		],
 		default is '';
 
+	column organization =>
+		refers_to A3C::Model::Organization by 'id',
+		is mandatory;
+
 	column hrEduPersonAffiliation =>
 		label is _('Povezanost s ustanovom'),
 		is mandatory,
@@ -253,38 +255,12 @@
 		label is 'Pripadnost grupi',
 		hint is 'skolskagodina::razred';
 
-	column o =>
-		label is _('Naziv matične ustanove'),
-		is mandatory;
-	
-	column hrEduPersonHomeOrg =>
-		label is _('Oznaka matične ustanove'),
-		hint is 'CARNet',
-		is mandatory;
-
 	column ou =>
 		label is _('Organizacijska jedinica');
 	
 	column roomNumber =>
 		label is _('Broj sobe');
 
-	column postalAddress =>
-		label is _('Poštanska adresa'),
-		render as 'textarea',
-		is mandatory;
-	
-	column l =>
-		label is _('Mjesto'),
-		hist is 'Zagreb',
-		is mandatory;
-
-	column postalCode =>
-		label is _('Poštanski broj'),
-		hint is 'HR-10000';
-
-	column street =>
-		label is _('Ulica i kućni broj');
-	
 	column homePostalAddress =>
 		label is _('Kućna poštanska adresa'),
 		render as 'textarea';
@@ -374,7 +350,7 @@
 sub canonicalize_hrEduPersonExpireDate {
 	my ( $self, $value ) = @_;
 
-	if ( $value eq 'NONE' ) {
+	if ( lc($value) eq 'none' ) {
 		$self->log->warn("fixed hrEduPersonExpireDate");
 		$value = '2042-12-30';
 	}