Permalink
Browse files

Merge branch 'master' of git://github.com/nursix/eden

  • Loading branch information...
flavour committed Oct 11, 2012
2 parents 3670965 + cd231ca commit c962f74c36636d9d0aedf2fcc867ff21f8fc592d
Showing with 5 additions and 5 deletions.
  1. +3 −3 modules/eden/org.py
  2. +2 −2 modules/s3/s3aaa.py
View
@@ -163,7 +163,7 @@ def model(self):
msg_list_empty=T("No Sectors currently registered"))
configure("org_sector", deduplicate=self.org_sector_duplicate)
-
+
sector_comment = S3AddResourceLink(c="org", f="sector",
label=ADD_SECTOR,
title=SECTOR,
@@ -1842,8 +1842,8 @@ def model(self):
),
self.org_organisation_id(
#widget=S3OrganisationAutocompleteWidget(default_from_profile=True),
- requires = self.org_organisation_requires(updateable=True),
- required = True,
+ requires = self.org_organisation_requires(updateable=True,
+ required=True),
),
office_type_id(
#readable = False,
View
@@ -295,7 +295,7 @@ def define_tables(self, migrate=True, fake_migrate=False):
readable=False, writable=False,
label=messages.label_registration_key),
Field("deleted", "boolean",
- default="",
+ default=False,
readable=False, writable=False),
Field("timestmp", "datetime",
default="",
@@ -346,7 +346,7 @@ def define_tables(self, migrate=True, fake_migrate=False):
readable=False, writable=False,
label=messages.label_registration_key),
Field("deleted", "boolean",
- default="",
+ default=False,
readable=False, writable=False),
Field("timestmp", "datetime",
default="",

0 comments on commit c962f74

Please sign in to comment.