0001-csv_import-remove-modify-import-form-53463.patch

Valentin Deniaud, 29 avril 2021 14:05

Voir les différences: en ligne côte à côte

Subject: [PATCH] csv_import: remove modify import form (#53463)

 src/authentic2/manager/forms.py               | 25 ----------------
 .../authentic2/manager/user_import.html       | 15 +++++-----
 src/authentic2/manager/user_views.py          | 29 ++++---------------
 tests/test_user_manager.py                    |  5 ++--
 4 files changed, 17 insertions(+), 57 deletions(-)

             return new_import
     class UserEditImportForm(UserImportForm):
         def __init__(self, *args, **kwargs):
             self.user_import = kwargs.pop('user_import')
             initial = kwargs.setdefault('initial', {})
             initial['encoding'] = self.user_import.encoding
             initial['ou'] = self.user_import.ou
             super(UserEditImportForm, self).__init__(*args, **kwargs)
             del self.fields['import_file']
         def clean(self):
             from authentic2.csv_import import CsvImporter
             encoding = self.cleaned_data['encoding']
             with self.user_import.import_file as fd:
                 importer = CsvImporter()
                 if not importer.run(fd, encoding):
                     self.raise_validation_error(importer.error.description or importer.error.code)
                 self.cleaned_data['rows_count'] = len(importer.rows)
         def save(self):
             with self.user_import.meta_update as meta:
                 meta['ou'] = self.cleaned_data['ou']
                 meta['encoding'] = self.cleaned_data['encoding']
     class RolesCsvImportForm(LimitQuerysetFormMixin, forms.Form):
         import_file = forms.FileField(
             label=_('Roles file'),

     {% block sidebar %}
       <aside id="sidebar">
         <div>
           <h3>{% trans "Modify import" %}</h3>
           <h3>{% trans "Actions" %}</h3>
           <form method="post" id="action-form">
             {% csrf_token %}
             {{ form|with_template }}
             <div class="buttons">
               <button name="modify">{% trans "Modify" %}</button>
               <button name="simulate">{% trans "Simulate" %}</button>
               <button name="execute">{% trans "Execute" %}</button>
               <button name="simulate">{% trans "Simulate import" %}</button>
             </div>
             <div class="buttons">
               <button name="execute">{% trans "Execute import" %}</button>
             </div>
           </form>
         </div>
         <div>
           <h3>{% trans "Download" %}</h3>
           <form action="download/{{ user_import.filename }}" id="download-form">
             <div class="buttons">
               <button>{% trans "Download" %}</button>
               <button>{% trans "Download CSV file" %}</button>
             </div>
           </form>
         </div>
-...
     {% endblock %}
     {% block main %}
       <p>{% trans "Encoding:" %} {{ encoding }}</p>
       <p>{% trans "Rows count:" %} {{ user_import.rows_count }}</p>
       <p>{% trans "Target Organizational Unit:" %} {{ user_import.ou }}</p>
       <h2>{% trans "Reports" %}</h2>
       <table class="main">
         <thead>

     from . import app_settings
     from .forms import (
         ENCODINGS,
         ChooseUserAuthorizationsForm,
         ChooseUserRoleForm,
         UserAddChooseOUForm,
-...
         UserChangeEmailForm,
         UserChangePasswordForm,
         UserEditForm,
         UserEditImportForm,
         UserNewImportForm,
         UserRoleSearchForm,
         UserSearchForm,
-...
     user_imports = UserImportsView.as_view()
     class UserImportView(MediaMixin, PermissionMixin, FormView):
         form_class = UserEditImportForm
     class UserImportView(MediaMixin, PermissionMixin, TemplateView):
         permissions = ['custom_user.admin_user']
         permissions_global = True
         template_name = 'authentic2/manager/user_import.html'
-...
                 return FileResponse(self.user_import.import_file, content_type='text/csv')
             return super(UserImportView, self).get(request, uuid=uuid, filename=filename)
         def get_form_kwargs(self):
             kwargs = super(UserImportView, self).get_form_kwargs()
             kwargs['user_import'] = self.user_import
             return kwargs
         def post(self, request, *args, **kwargs):
             from authentic2.manager import user_import
-...
                     report.delete()
                 return redirect(request, 'a2-manager-users-import', kwargs={'uuid': self.user_import.uuid})
             simulate = 'simulate' in request.POST
             execute = 'execute' in request.POST
             if simulate or execute:
                 report = user_import.Report.new(self.user_import)
                 report.run(simulate=simulate)
                 return redirect(request, 'a2-manager-users-import', kwargs={'uuid': self.user_import.uuid})
             return super(UserImportView, self).post(request, *args, **kwargs)
         def form_valid(self, form):
             form.save()
             return super(UserImportView, self).form_valid(form)
         def get_success_url(self):
             return reverse('a2-manager-users-import', kwargs={'uuid': self.user_import.uuid})
             report = user_import.Report.new(self.user_import)
             report.run(simulate=bool('simulate' in request.POST))
             return redirect(request, 'a2-manager-users-import', kwargs={'uuid': self.user_import.uuid})
         def get_context_data(self, **kwargs):
             ctx = super(UserImportView, self).get_context_data(**kwargs)
             ctx['encoding'] = [encoding for id, encoding in ENCODINGS if id == self.user_import.encoding][0]
             ctx['user_import'] = self.user_import
             ctx['reports'] = sorted(self.user_import.reports, key=operator.attrgetter('created'), reverse=True)
             return ctx
-...
     class UserImportReportView(MediaMixin, PermissionMixin, TemplateView):
         form_class = UserEditImportForm
         permissions = ['custom_user.admin_user']
         permissions_global = True

         response = response.follow()
         response = response.forms['action-form'].submit(name='modify').follow()
         response = response.forms['action-form'].submit(name='simulate')
         reports = list(_import.reports)
-...
         start = time.time()
         response = response.click('Users Import')
         assert 'Encoding: Unicode (UTF-8)' in response.text
         assert 'Target Organizational Unit: Default organizational unit' in response.text
         while 'Running' in response.text:
             response = response.click('Users Import')
             assert time.time() - start < 2
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-csv_import-remove-modify-import-form-53463.patch