--- lib/A3C/Model/User.pm	2008/03/18 19:58:34	35
+++ lib/A3C/Model/Person.pm	2008/04/09 23:14:47	66
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-package A3C::Model::User;
+package A3C::Model::Person;
 use Jifty::DBI::Schema;
 
 use utf8;
@@ -88,6 +88,11 @@
 		label is _('Tip administratora'),
 		valid are [ '', 'AS', 'AI', 'AR', 'AHU' ];
 
+	column hrEduPersonHomeOrg =>
+		label is _('Oznaka matične ustanove'),
+		hint is 'CARNet',
+		is mandatory;
+
 	column hrEduPersonProfessionalStatus =>
 		label is _('Stručni status'),
 		valid are [
@@ -148,9 +153,13 @@
 		],
 		default is '';
 
-	column organization =>
-		refers_to A3C::Model::Organization by 'id',
-		is mandatory;
+	column 'o';
+	column 'l';
+	column 'postalAddress';
+
+#	column organization =>
+#		refers_to A3C::Model::Organization by 'id',
+#		is mandatory;
 
 	column hrEduPersonAffiliation =>
 		label is _('Povezanost s ustanovom'),
@@ -275,18 +284,18 @@
 		label is _('Oznaka privatnosti');
 
 	column loginShell =>
-		label is _('shell');
+		label is _('login shell');
 
 	column uidNumber =>
-		label is _('uid'),
+		label is _('uid number'),
 		type is 'int';
 
 	column gidNumber =>
-		label is _('gid');
+		label is _('gid number');
 		type is 'int';
 
 	column homeDirectory =>
-		label is _('home');
+		label is _('home directory');
 
 };
 
@@ -329,6 +338,15 @@
 
 sub email_confirmed { 1 };
 
+=head2 name
+
+=cut
+
+sub name {
+	my $self = shift;
+	return $self->__value('cn') . ' <' . $self->__value('mail') . '>';
+}
+
 =head2 validate_telephoneNumber
 
 =cut
@@ -341,7 +359,7 @@
 	return ( 1, 'OK' );
 }
 
-=head hrEduPersonUniqueNumber
+=head2 hrEduPersonUniqueNumber
 
 Check if JMBG is valid
 
@@ -407,5 +425,6 @@
 	return 1;
 }
 
+
 1;