Revision d240ebcb cloudcms/admin.py

b/cloudcms/admin.py
80 80
    context = {}
81 81
    form = RstZipImportForm()
82 82

  
83
    if request.GET.get('form_saved'):
84
        context['save_log'] = request.session.get('save_log')
85
    else:
86
        if request.session.get('save_log'):
87
            del request.session['save_log']
88

  
83 89
    if request.method == 'POST':
84 90
        form = RstZipImportForm(request.POST, request.FILES)
85 91
        if form.is_valid():
86 92
            try:
87
                ret = form.save(request.user)
88
                messages.add_message(request, messages.INFO, 'Form saved')
89
                return redirect('/cmsmanage/sphinximport/')
93
                saved, log = form.save(request.user)
94
                if saved:
95
                    messages.add_message(request, messages.INFO, 'Form saved')
96
                    request.session['save_log'] = log.replace("\n", "<br />")
97
                    return redirect('/cmsmanage/sphinximport/' + '?form_saved=1')
98
                else:
99
                    messages.add_message(request, messages.ERROR, 'Form failed')
100
                    context['save_log'] = log.replace("\n", "<br />")
90 101
            except Exception, e:
91
                context['exception'] = e
102
                context['save_log'] = e
92 103

  
93 104
        else:
94 105
            context['error'] = True

Also available in: Unified diff