Merge pull request #204 from Cadasta/bugfix/#195

Fix #195 -- Correct display of project forms
Cadasta · May 19, 2016 · 692a2a0 · 692a2a0
2 parents 196f872 + 90824f2
commit 692a2a0
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 2 deletions.
diff --git a/cadasta/organization/tests/test_widgets.py b/cadasta/organization/tests/test_widgets.py
@@ -58,6 +58,31 @@ def test_render_with_manager(self):
 
 
 class PublicPrivateToggleTest(TestCase):
+    def test_render_none(self):
+        widget = PublicPrivateToggle()
+        html = widget.render('field-name', None)
+
+        expected = (
+            '<div class="public-private-widget">'
+            '  <label for"field-name">Project visibility</label>'
+            '  <div>'
+            '    Public<br>'
+            '    <span class="glyphicon glyphicon-eye-open"></span>'
+            '  </div>'
+            '  <div>'
+            '    <input name="field-name"  type="checkbox"'
+            '           data-toggle="toggle" data-onstyle="danger"'
+            '           data-offstyle="success" data-on=" " data-off=" ">'
+            '  </div>'
+            '  <div>'
+            '    Private<br>'
+            '    <span class="glyphicon glyphicon-eye-close"></span>'
+            '  </div>'
+            '</div>'
+        )
+
+        assert expected == html
+
     def test_render_public(self):
         widget = PublicPrivateToggle()
         html = widget.render('field-name', 'public')
@@ -108,6 +133,31 @@ def test_render_private(self):
 
         assert expected == html
 
+    def test_render_on(self):
+        widget = PublicPrivateToggle()
+        html = widget.render('field-name', 'on')
+
+        expected = (
+            '<div class="public-private-widget">'
+            '  <label for"field-name">Project visibility</label>'
+            '  <div>'
+            '    Public<br>'
+            '    <span class="glyphicon glyphicon-eye-open"></span>'
+            '  </div>'
+            '  <div>'
+            '    <input name="field-name" checked type="checkbox"'
+            '           data-toggle="toggle" data-onstyle="danger"'
+            '           data-offstyle="success" data-on=" " data-off=" ">'
+            '  </div>'
+            '  <div>'
+            '    Private<br>'
+            '    <span class="glyphicon glyphicon-eye-close"></span>'
+            '  </div>'
+            '</div>'
+        )
+
+        assert expected == html
+
 
 class ContactsWidgetTest(TestCase):
     def test_value_from_datadict(self):

diff --git a/cadasta/organization/views/default.py b/cadasta/organization/views/default.py
@@ -350,6 +350,7 @@ def get_context_data(self, *args, **kwargs):
         logo = orgs.first().logo if orgs.first() is not None else ''
         context['init_org_logo'] = logo
         context['init_org_hidden'] = 'org-logo-hidden' if logo is None else ''
+        context['display_org'] = self.kwargs.get('organization')
         form = context['wizard']['form']
         if isinstance(form, forms.ProjectAddExtents):
             context['wizard_step_classes'] = {

diff --git a/cadasta/organization/widgets.py b/cadasta/organization/widgets.py
@@ -72,7 +72,7 @@ def render(self, name, value, attrs=None):
             name=name,
             public=_("Public"),
             private=_("Private"),
-            checked=('checked' if value != 'public' else '')
+            checked=('checked' if value in ['private', 'on'] else '')
         )
 
 

diff --git a/cadasta/templates/organization/project_add_details.html b/cadasta/templates/organization/project_add_details.html
@@ -41,7 +41,7 @@
   </div>
 </div>
 
-<div class="row{% if wizard.form.organization.value %} hidden{% endif %}">
+<div class="row{% if display_org %} hidden{% endif %}">
   <div class="col-md-7">
     <div class="form-group">
       {{ wizard.form.organization.errors }}