From 6dac226f26628ff3f979bcf58c2d2b37d941c6e3 Mon Sep 17 00:00:00 2001 From: Aron Carroll Date: Mon, 25 Jun 2012 17:18:19 +0100 Subject: [PATCH] [2375] Mark other stages as complete when going back to dataset This is not technically correct but works for the moment. --- ckan/controllers/package.py | 7 ++++--- ckan/templates/package/pages/form_page.html | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py index 6f4a244f2cd..df6fe9c8c3d 100644 --- a/ckan/controllers/package.py +++ b/ckan/controllers/package.py @@ -433,9 +433,10 @@ def new(self, data=None, errors=None, error_summary=None): error_summary = error_summary or {} # in the phased add dataset we need to know that # we have already completed stage 1 - stage = 1 + stage = ['active'] if c.form_style == 'new': - stage = 1 + stage = ['active', 'complete', 'complete'] + vars = {'data': data, 'errors': errors, 'error_summary': error_summary, 'action': 'new', 'stage' : stage} c.errors_json = json.dumps(errors) @@ -447,7 +448,7 @@ def new(self, data=None, errors=None, error_summary=None): c.form = render(self.package_form, extra_vars=vars) else: c.form = render(self._package_form(package_type=package_type), extra_vars=vars) - return render( self._new_template(package_type)) + return render( self._new_template(package_type), extra_vars={'stage': stage}) def new_resource(self, id, data=None, errors=None, error_summary=None): ''' FIXME: This is a temporary action to allow styling of the forms. ''' diff --git a/ckan/templates/package/pages/form_page.html b/ckan/templates/package/pages/form_page.html index 7560a9481dc..124891aa0b8 100644 --- a/ckan/templates/package/pages/form_page.html +++ b/ckan/templates/package/pages/form_page.html @@ -9,7 +9,7 @@ {% block primary_content %}
- {% block stages %}{{ h.snippet('package/snippets/stages.html', stages=['active']) }}{% endblock %} + {% block stages %}{{ h.snippet('package/snippets/stages.html', stages=stage) }}{% endblock %} {% block form %}{{ c.form | safe }}{% endblock %}