Merge branch 'main' of http://10.10.1.136:3000/ismail/haikal into frontend
This commit is contained in:
commit
1acd8e62fb
@ -2658,7 +2658,7 @@ class UserCreateView(
|
|||||||
password = "Tenhal@123"
|
password = "Tenhal@123"
|
||||||
|
|
||||||
user = User.objects.create_user(
|
user = User.objects.create_user(
|
||||||
username=form.cleaned_data["name"], email=email, password=password
|
username=email, email=email, password=password
|
||||||
)
|
)
|
||||||
user.is_staff = True
|
user.is_staff = True
|
||||||
user.save()
|
user.save()
|
||||||
@ -4677,8 +4677,8 @@ class LeadListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
|
|||||||
if self.request.is_dealer:
|
if self.request.is_dealer:
|
||||||
return qs
|
return qs
|
||||||
staffmember = getattr(self.request.user, "staffmember", None)
|
staffmember = getattr(self.request.user, "staffmember", None)
|
||||||
if staffmember and getattr(staffmember, "staff", None):
|
if staff:= getattr(staffmember, "staff", None):
|
||||||
qs = qs.filter(staff=staffmember.staff)
|
return qs.filter(staff=staff)
|
||||||
return models.Lead.objects.none()
|
return models.Lead.objects.none()
|
||||||
|
|
||||||
|
|
||||||
@ -5367,7 +5367,7 @@ class OpportunityCreateView(CreateView, SuccessMessageMixin, LoginRequiredMixin)
|
|||||||
return super().form_valid(form)
|
return super().form_valid(form)
|
||||||
|
|
||||||
def get_success_url(self):
|
def get_success_url(self):
|
||||||
return reverse_lazy("opportunity_detail", kwargs={"pk": self.object.pk})
|
return reverse_lazy("opportunity_detail", kwargs={"slug": self.object.slug})
|
||||||
|
|
||||||
|
|
||||||
class OpportunityUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView):
|
class OpportunityUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView):
|
||||||
@ -5426,7 +5426,7 @@ class OpportunityDetailView(LoginRequiredMixin, DetailView):
|
|||||||
def get_context_data(self, **kwargs):
|
def get_context_data(self, **kwargs):
|
||||||
context = super().get_context_data(**kwargs)
|
context = super().get_context_data(**kwargs)
|
||||||
form = forms.OpportunityStatusForm()
|
form = forms.OpportunityStatusForm()
|
||||||
url = reverse("opportunity_update_status", args=[self.object.pk])
|
url = reverse("opportunity_update_status", args=[self.object.slug])
|
||||||
form.fields["status"].widget.attrs["hx-get"] = url
|
form.fields["status"].widget.attrs["hx-get"] = url
|
||||||
form.fields["stage"].widget.attrs["hx-get"] = url
|
form.fields["stage"].widget.attrs["hx-get"] = url
|
||||||
form.fields["stage"].initial = self.object.stage
|
form.fields["stage"].initial = self.object.stage
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user