--- lib/A3C/Model/Organization.pm	2008/03/18 19:03:53	32
+++ lib/A3C/Model/Organization.pm	2008/05/15 19:18:45	121
@@ -1,20 +1,27 @@
 use strict;
 use warnings;
 
+=head1 WARNING
+
+B<This code is obsolete> since application is using L<A3C::Model::hrEduOrg>
+
+=cut
+
 package A3C::Model::Organization;
 use Jifty::DBI::Schema;
 
 use A3C::Record schema {
 
+	column uid =>
+		label is _('UID'),
+		is indexed,
+		is distinct,
+		is mandatory;
+
 	column o =>
 		label is _('Naziv matične ustanove'),
 		is mandatory;
 	
-	column hrEduPersonHomeOrg =>
-		label is _('Oznaka matične ustanove'),
-		hint is 'CARNet',
-		is mandatory;
-
 	column l =>
 		label is _('Mjesto'),
 		hist is 'Zagreb',
@@ -31,11 +38,67 @@
 
 	column street =>
 		label is _('Ulica i kućni broj');
+
+	column hrEduOrgUniqueNumber =>
+		label is _('hrEduOrgUniqueNumber'),
+		is indexed,
+		is mandatory;
+	
+	column telephoneNumber =>
+		label is _('Broj telefona');
+
+	column facsimileTelephoneNumber =>
+		label is _('fax number');
+
+	column cn =>
+		label is _('cn'),
+		is indexed;
+	
+	column dc =>
+		label is _('dc'),
+		is indexed;
+
+	column uidNumber =>
+		type is 'int',
+		label is _('uid number');
 	
+	column gidNumber =>
+		type is 'int',
+		label is _('gid number');
+
+	column homeDirectory =>
+		label is _('home directory');
+
+	column 'loginShell';
+
+	column 'hrEduOrgMail';
+
+	column 'hrEduOrgType';
+
+	column 'hrEduOrgURL';
+
+	column 'hrEduOrgPolicyURI';
+
+	column 'hrEduOrgMobile';
+
+	column 'hrEduOrgMember';
 
 };
 
 # Your model-specific methods go here.
 
+=head2 name
+
+Humanly readable name of organization
+
+=cut
+
+sub name {
+	my $self = shift;
+	return $self->cn . ' - ' . $self->o;
+}
+
+use A3C::DefaultACL;
+
 1;