From d9cdb013501502259404ddd39fe18b2a4f9b7578 Mon Sep 17 00:00:00 2001
From: Pierre-antoine Comby <comby@crans.org>
Date: Thu, 26 Mar 2020 17:44:01 +0100
Subject: [PATCH] remove alias handling backend, gonna use DRF

---
 apps/member/urls.py  |  1 -
 apps/member/views.py | 64 ++++++++++----------------------------------
 apps/note/forms.py   | 11 --------
 3 files changed, 14 insertions(+), 62 deletions(-)

diff --git a/apps/member/urls.py b/apps/member/urls.py
index 1b296771..0b705bfd 100644
--- a/apps/member/urls.py
+++ b/apps/member/urls.py
@@ -20,7 +20,6 @@ urlpatterns = [
     path('user/<int:pk>/update', views.UserUpdateView.as_view(), name="user_update_profile"),
     path('user/<int:pk>/update_pic', views.ProfilePictureUpdateView.as_view(), name="user_update_pic"),
     path('user/<int:pk>/aliases', views.ProfileAliasView.as_view(), name="user_alias"),
-    path('user/aliases/delete/<int:pk>', views.DeleteAliasView.as_view(), name="user_alias_delete"),
     path('manage-auth-token/', views.ManageAuthTokens.as_view(), name='auth_token'),
     # API for the user autocompleter
     path('user/user-autocomplete', views.UserAutocomplete.as_view(), name="user_autocomplete"),
diff --git a/apps/member/views.py b/apps/member/views.py
index 1ea2212c..2992f76e 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -20,7 +20,8 @@ from django.views.generic import CreateView, DetailView, UpdateView, TemplateVie
 from django.views.generic.edit import FormMixin
 from django_tables2.views import SingleTableView
 from rest_framework.authtoken.models import Token
-from note.forms import AliasForm, ImageForm
+from note.forms import ImageForm
+#from note.forms import AliasForm, ImageForm
 from note.models import Alias, NoteUser
 from note.models.transactions import Transaction
 from note.tables import HistoryTable, AliasTable
@@ -167,61 +168,18 @@ class UserListView(LoginRequiredMixin, SingleTableView):
         context["filter"] = self.filter
         return context
 
-
-
     
-class AliasView(LoginRequiredMixin, FormMixin, DetailView):
-    form_class = AliasForm
-
+class ProfileAliasView(LoginRequiredMixin, DetailView):
+    model = User
+    template_name = 'member/profile_alias.html'
+    context_object_name = 'user_object'
+    
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         note = context['object'].note
         context["aliases"] = AliasTable(note.alias_set.all())
         return context
 
-    def get_success_url(self):
-        return reverse_lazy('member:user_alias', kwargs={'pk': self.object.id})
-
-    def post(self, request, *args, **kwargs):
-        self.object = self.get_object()
-        form = self.get_form()
-        if form.is_valid():
-            return self.form_valid(form)
-        else:
-            return self.form_invalid(form)
-
-    def form_valid(self, form):
-        alias = form.save(commit=False)
-        alias.note = self.object.note
-        alias.save()
-        return super().form_valid(form)
-
-class ProfileAliasView(AliasView):
-    model = User
-    template_name = 'member/profile_alias.html'
-    context_object_name = 'user_object'
-
-
-class DeleteAliasView(LoginRequiredMixin, DeleteView):
-    model = Alias
-
-    def delete(self, request, *args, **kwargs):
-        try:
-            self.object = self.get_object()
-            self.object.delete()
-        except ValidationError as e:
-            # TODO: pass message to redirected view.
-            messages.error(self.request, str(e))
-        else:
-            messages.success(self.request, _("Alias successfully deleted"))
-        return HttpResponseRedirect(self.get_success_url())
-
-    def get_success_url(self):
-        return reverse_lazy('member:user_alias', kwargs={'pk': self.object.note.user.pk})
-
-    def get(self, request, *args, **kwargs):
-        return self.post(request, *args, **kwargs)
-
 
 class PictureUpdateView(LoginRequiredMixin, FormMixin, DetailView):
     form_class = ImageForm
@@ -368,10 +326,16 @@ class ClubDetailView(LoginRequiredMixin, DetailView):
         context['member_list'] = club_member
         return context
 
-class ClubAliasView(AliasView):
+class ClubAliasView(LoginRequiredMixin, DetailView):
     model = Club
     template_name = 'member/club_alias.html'
     context_object_name = 'club'
+    
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        note = context['object'].note
+        context["aliases"] = AliasTable(note.alias_set.all())
+        return context
 
 
 class ClubUpdateView(LoginRequiredMixin, UpdateView):
diff --git a/apps/note/forms.py b/apps/note/forms.py
index ac6adaaf..60252ad5 100644
--- a/apps/note/forms.py
+++ b/apps/note/forms.py
@@ -9,17 +9,6 @@ from .models import Alias
 from .models import TransactionTemplate
 
 
-class AliasForm(forms.ModelForm):
-    class Meta:
-        model = Alias
-        fields = ("name",)
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields["name"].label = False
-        self.fields["name"].widget.attrs = {"placeholder": _('New Alias')}
-
-
 class ImageForm(forms.Form):
     image = forms.ImageField(required=False,
                              label=_('select an image'),