mirror of https://gitlab.crans.org/bde/nk20
remove alias handling backend, gonna use DRF
This commit is contained in:
parent
7568abb681
commit
d9cdb01350
|
@ -20,7 +20,6 @@ urlpatterns = [
|
||||||
path('user/<int:pk>/update', views.UserUpdateView.as_view(), name="user_update_profile"),
|
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>/update_pic', views.ProfilePictureUpdateView.as_view(), name="user_update_pic"),
|
||||||
path('user/<int:pk>/aliases', views.ProfileAliasView.as_view(), name="user_alias"),
|
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'),
|
path('manage-auth-token/', views.ManageAuthTokens.as_view(), name='auth_token'),
|
||||||
# API for the user autocompleter
|
# API for the user autocompleter
|
||||||
path('user/user-autocomplete', views.UserAutocomplete.as_view(), name="user_autocomplete"),
|
path('user/user-autocomplete', views.UserAutocomplete.as_view(), name="user_autocomplete"),
|
||||||
|
|
|
@ -20,7 +20,8 @@ from django.views.generic import CreateView, DetailView, UpdateView, TemplateVie
|
||||||
from django.views.generic.edit import FormMixin
|
from django.views.generic.edit import FormMixin
|
||||||
from django_tables2.views import SingleTableView
|
from django_tables2.views import SingleTableView
|
||||||
from rest_framework.authtoken.models import Token
|
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 import Alias, NoteUser
|
||||||
from note.models.transactions import Transaction
|
from note.models.transactions import Transaction
|
||||||
from note.tables import HistoryTable, AliasTable
|
from note.tables import HistoryTable, AliasTable
|
||||||
|
@ -168,10 +169,10 @@ class UserListView(LoginRequiredMixin, SingleTableView):
|
||||||
return context
|
return context
|
||||||
|
|
||||||
|
|
||||||
|
class ProfileAliasView(LoginRequiredMixin, DetailView):
|
||||||
|
model = User
|
||||||
class AliasView(LoginRequiredMixin, FormMixin, DetailView):
|
template_name = 'member/profile_alias.html'
|
||||||
form_class = AliasForm
|
context_object_name = 'user_object'
|
||||||
|
|
||||||
def get_context_data(self, **kwargs):
|
def get_context_data(self, **kwargs):
|
||||||
context = super().get_context_data(**kwargs)
|
context = super().get_context_data(**kwargs)
|
||||||
|
@ -179,49 +180,6 @@ class AliasView(LoginRequiredMixin, FormMixin, DetailView):
|
||||||
context["aliases"] = AliasTable(note.alias_set.all())
|
context["aliases"] = AliasTable(note.alias_set.all())
|
||||||
return context
|
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):
|
class PictureUpdateView(LoginRequiredMixin, FormMixin, DetailView):
|
||||||
form_class = ImageForm
|
form_class = ImageForm
|
||||||
|
@ -368,11 +326,17 @@ class ClubDetailView(LoginRequiredMixin, DetailView):
|
||||||
context['member_list'] = club_member
|
context['member_list'] = club_member
|
||||||
return context
|
return context
|
||||||
|
|
||||||
class ClubAliasView(AliasView):
|
class ClubAliasView(LoginRequiredMixin, DetailView):
|
||||||
model = Club
|
model = Club
|
||||||
template_name = 'member/club_alias.html'
|
template_name = 'member/club_alias.html'
|
||||||
context_object_name = 'club'
|
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):
|
class ClubUpdateView(LoginRequiredMixin, UpdateView):
|
||||||
model = Club
|
model = Club
|
||||||
|
|
|
@ -9,17 +9,6 @@ from .models import Alias
|
||||||
from .models import TransactionTemplate
|
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):
|
class ImageForm(forms.Form):
|
||||||
image = forms.ImageField(required=False,
|
image = forms.ImageField(required=False,
|
||||||
label=_('select an image'),
|
label=_('select an image'),
|
||||||
|
|
Loading…
Reference in New Issue