summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2011-01-30 18:33:51 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2011-01-30 18:33:51 +0100
commit2d71ae7cfc3affe9e88dcc8671a1b97690f1f3b1 (patch)
treeb5f702e9e7f930517235def960715e248812efb3
parent0e42a2b15535fee6cdaf97bbbeec93e08093da28 (diff)
downloadIshtar-2d71ae7cfc3affe9e88dcc8671a1b97690f1f3b1.tar.bz2
Ishtar-2d71ae7cfc3affe9e88dcc8671a1b97690f1f3b1.zip
Correct the addition of new items (closes #115)
-rw-r--r--ishtar/furnitures/forms.py10
-rw-r--r--static/media/style.css6
2 files changed, 11 insertions, 5 deletions
diff --git a/ishtar/furnitures/forms.py b/ishtar/furnitures/forms.py
index c49367ab4..5071adec7 100644
--- a/ishtar/furnitures/forms.py
+++ b/ishtar/furnitures/forms.py
@@ -245,11 +245,11 @@ class Wizard(NamedUrlSessionFormWizard):
# get a form key
base_key = form.form.base_fields.keys()[0]
init = self.get_form_initial(request, storage, step)
- if not init or to_delete:
- total_field = len([key for key in data.keys()
- if base_key in key.split('-') and data[key]])
- else:
- total_field = len(init)
+ total_field = len([key for key in data.keys()
+ if base_key in key.split('-')
+ and data[key]])
+ if init and not to_delete:
+ total_field = max((total_field, len(init)))
data[step + u'-INITIAL_FORMS'] = unicode(total_field)
data[step + u'-TOTAL_FORMS'] = unicode(total_field + 1)
data = data or None
diff --git a/static/media/style.css b/static/media/style.css
index 126beabc0..670c2f3a4 100644
--- a/static/media/style.css
+++ b/static/media/style.css
@@ -220,6 +220,12 @@ div.form .errorlist{
text-align:center;
}
+div.form table.confirm{
+ padding:0.5em 2em;
+ margin-left:0;
+ width:100%;
+}
+
table.confirm tr.spacer td:last-child{
border-bottom:1px solid #922;
}