diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2013-04-11 14:59:59 +0000 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2013-04-11 14:59:59 +0000 |
| commit | 176b0ebae664c68a2c25edf2823aad589953b2bc (patch) | |
| tree | d6572bac802f13f4dd55dc1f8bace322b1e868ee | |
| parent | a4cefc5752d34c8b971477a358a17f0a73af29b2 (diff) | |
| parent | 34fe6db2c9b109748cfb6e217848336d7f2c1392 (diff) | |
| download | Ishtar-176b0ebae664c68a2c25edf2823aad589953b2bc.tar.bz2 Ishtar-176b0ebae664c68a2c25edf2823aad589953b2bc.zip | |
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
| -rw-r--r-- | archaeological_operations/wizards.py | 2 | ||||
| -rw-r--r-- | example_project/settings.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py index 4205144e6..419cac895 100644 --- a/archaeological_operations/wizards.py +++ b/archaeological_operations/wizards.py @@ -157,7 +157,7 @@ class OperationWizard(Wizard): except (ValueError, IndexError): continue keys.add(items[-1]) - if max(numbers) - 1: + if numbers and max(numbers) - 1 > 0: initial = [dict([(k, data[step+'-'+unicode(max(numbers)-1)+'-'+k]) for k in keys if k != 'parcel_number'])] self.form_initialized = True diff --git a/example_project/settings.py b/example_project/settings.py index febed6a61..5b333de1d 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -19,6 +19,7 @@ DEBUG = 1 TEMPLATE_DEBUG = DEBUG AUTH_PROFILE_MODULE = 'ishtar_common.IshtarUser' +ACCOUNT_ACTIVATION_DAYS = 7 # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name |