0003-pricing-simplify-mixins-and-permission-checks-65442.patch

Lauréline Guérin, 20 mai 2022 10:00

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

Subject: [PATCH 3/3] pricing: simplify mixins and permission checks (#65442)

 lingo/agendas/models.py                       |  6 ------
 lingo/agendas/views.py                        | 20 +------------------
 .../manager_agenda_pricing_detail.html        |  4 ----
 lingo/pricing/views.py                        | 16 ++++++---------
 4 files changed, 7 insertions(+), 39 deletions(-)

             return agenda, False
         def can_be_managed(self, user):
             return True
         def can_be_viewed(self, user):
             return True
     class CheckTypeGroup(models.Model):
         slug = models.SlugField(_('Identifier'), max_length=160, unique=True)

     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     from django.core.exceptions import PermissionDenied
     from django.shortcuts import get_object_or_404
     from .models import Agenda
     class ViewableAgendaMixin:
     class AgendaMixin:
         agenda = None
         def set_agenda(self, **kwargs):
-...
         def dispatch(self, request, *args, **kwargs):
             self.set_agenda(**kwargs)
             if not self.check_permissions(request.user):
                 raise PermissionDenied()
             return super().dispatch(request, *args, **kwargs)
         def check_permissions(self, user):
             return True  # return self.agenda.can_be_viewed(user)
         def get_context_data(self, **kwargs):
             context = super().get_context_data(**kwargs)
             context['agenda'] = self.agenda
             return context
     class ManagedAgendaMixin(ViewableAgendaMixin):
         def check_permissions(self, user):
             return True  # XXX: return self.agenda.can_be_managed(user)
         def get_form_kwargs(self):
             kwargs = super().get_form_kwargs()
             if not kwargs.get('instance'):
                 kwargs['instance'] = self.model()
             kwargs['instance'].agenda = self.agenda
             return kwargs
         def get_success_url(self):
             # XXX:  return reverse('lingo-manager-agenda-settings', kwargs={'pk': self.agenda.id})
             return '/'

     <h2>
         {{ object.pricing }} ({{ object.date_start|date:'d/m/Y' }} - {{ object.date_end|date:'d/m/Y' }})
     </h2>
     {% if user_can_manage %}
     <span class="actions">
       <a class="extra-actions-menu-opener"></a>
       <ul class="extra-actions-menu">
-...
         <li><a rel="popup" href="{% url 'lingo-manager-agenda-pricing-delete' agenda.pk object.pk %}">{% trans 'Delete' %}</a></li>
       </ul>
     </span>
     {% endif %}
     {% endblock %}
     {% block content %}
-...
           {% endfor %}
         </tbody>
       </table>
       {% if user_can_manage %}
       <p>
       <a class="pk-button" href="{% if matrix.criteria %}{% url 'lingo-manager-agenda-pricing-matrix-slug-edit' agenda.pk object.pk matrix.criteria.slug %}{% else %}{% url 'lingo-manager-agenda-pricing-matrix-edit' agenda.pk object.pk %}{% endif %}">{% trans "Edit pricing" %}</a>
       </p>
       {% endif %}
     </div>
     </div>
     {% empty %}

     from django.views.generic.detail import SingleObjectMixin
     from lingo.agendas.models import Agenda
     from lingo.agendas.views import ManagedAgendaMixin, ViewableAgendaMixin
     from lingo.agendas.views import AgendaMixin
     from lingo.pricing.forms import (
         AgendaPricingForm,
         CriteriaForm,
-...
     criteria_delete = CriteriaDeleteView.as_view()
     class AgendaPricingAddView(ManagedAgendaMixin, CreateView):
     class AgendaPricingAddView(AgendaMixin, CreateView):
         template_name = 'lingo/pricing/manager_agenda_pricing_form.html'
         model = AgendaPricing
         form_class = AgendaPricingForm
-...
     agenda_pricing_add = AgendaPricingAddView.as_view()
     class AgendaPricingDetailView(ViewableAgendaMixin, DetailView):
     class AgendaPricingDetailView(AgendaMixin, DetailView):
         model = AgendaPricing
         pk_url_kwarg = 'pricing_pk'
         template_name = 'lingo/pricing/manager_agenda_pricing_detail.html'
-...
                 'pricing__criterias__category'
+            )
         def get_context_data(self, **kwargs):
             kwargs['user_can_manage'] = self.agenda.can_be_managed(self.request.user)
             return super().get_context_data(**kwargs)
     agenda_pricing_detail = AgendaPricingDetailView.as_view()
     class AgendaPricingEditView(ManagedAgendaMixin, UpdateView):
     class AgendaPricingEditView(AgendaMixin, UpdateView):
         template_name = 'lingo/pricing/manager_agenda_pricing_form.html'
         model = AgendaPricing
         pk_url_kwarg = 'pricing_pk'
-...
     agenda_pricing_edit = AgendaPricingEditView.as_view()
     class AgendaPricingDeleteView(ManagedAgendaMixin, DeleteView):
     class AgendaPricingDeleteView(AgendaMixin, DeleteView):
         template_name = 'lingo/manager_confirm_delete.html'
         model = AgendaPricing
         pk_url_kwarg = 'pricing_pk'
-...
     agenda_pricing_delete = AgendaPricingDeleteView.as_view()
     class AgendaPricingMatrixEdit(ManagedAgendaMixin, FormView):
     class AgendaPricingMatrixEdit(AgendaMixin, FormView):
         template_name = 'lingo/pricing/manager_agenda_pricing_matrix_form.html'
         def set_agenda(self, **kwargs):
+    -

Projet

Général

Profil

Produits Entr'ouvert » Lingo

0003-pricing-simplify-mixins-and-permission-checks-65442.patch