code enhancements (#90)

This commit is contained in:
Ashwin Kumar 2018-09-29 15:55:38 +05:30 committed by nikhila05
parent efc50b22b1
commit fa156da439
14 changed files with 113 additions and 49 deletions

View file

@ -154,6 +154,7 @@
</div>
<div class="row marl">
<div class="col-md-12">
{% if comment_permission %}
<form id="comment_form" method="POST" enctype="multipart/form-data">
<div class="form-group">
<textarea class="form-control" textarea cols="40" rows="3" id="id_comments" name="comment" placeholder="Submit Your Comments Here"></textarea><span><i id="CommentError" style="display:none; color:red"></i></span>
@ -164,6 +165,7 @@
</div>
<input type="hidden" value="{{ account_record.id }}" name="accountid">
</form>
{% endif %}
<ul class="list-group" id="comments_div">
{% for comment in comments %}
<li class="list-group-item list-row" id="comment{{comment.id}}">

View file

@ -1,7 +1,10 @@
from django.contrib.auth.mixins import LoginRequiredMixin
from django.http import JsonResponse
from django.shortcuts import get_object_or_404, redirect
from django.views.generic import CreateView, UpdateView, DetailView, TemplateView, View, DeleteView
from django.contrib.auth.decorators import login_required
from django.http import HttpResponseRedirect, HttpResponse, JsonResponse
from django.shortcuts import render, get_object_or_404, redirect
from django.urls import reverse
from django.views.generic import (
CreateView, UpdateView, DetailView, ListView, TemplateView, View, DeleteView)
from accounts.models import Account
from common.models import User, Address, Team, Comment
@ -129,6 +132,13 @@ class AccountDetailView(LoginRequiredMixin, DetailView):
def get_context_data(self, **kwargs):
context = super(AccountDetailView, self).get_context_data(**kwargs)
account_record = context["account_record"]
if (
self.request.user in account_record.assigned_to.all() or
self.request.user == account_record.created_by
):
comment_permission = True
else:
comment_permission = False
context.update({
"comments": account_record.accounts_comments.all(),
"opportunity_list": Opportunity.objects.filter(account=account_record),
@ -143,6 +153,7 @@ class AccountDetailView(LoginRequiredMixin, DetailView):
"case_types": CASE_TYPE,
"case_priority": PRIORITY_CHOICE,
"case_status": STATUS_CHOICE,
'comment_permission': comment_permission,
})
return context
@ -211,9 +222,9 @@ class AccountUpdateView(LoginRequiredMixin, UpdateView):
else:
if self.request.POST:
context["billing_form"] = BillingAddressForm(
request.POST, instance=self.object.billing_address)
self.request.POST, instance=self.object.billing_address)
context["shipping_form"] = ShippingAddressForm(
request.POST, instance=self.object.shipping_address, prefix='ship')
self.request.POST, instance=self.object.shipping_address, prefix='ship')
else:
context["billing_form"] = BillingAddressForm(
instance=self.object.billing_address)

View file

@ -16,7 +16,11 @@
<div class="card">
<div class="card-body">
<div class="card-title text-center">
{% if user_obj %}
EDIT USER
{% else %}
CREATE USER
{% endif %}
</div>
<div class="row marl">
<div class="col-md-12">
@ -44,7 +48,7 @@
<div class="filter_col col-md-12">
<div class="form-group">
<label for="id_email">Email Address{% if user_form.email.field.required %}<span class="error">*</span>{% endif %}</label>
<input type="text" class="form-control" name="email" value="{% if user_obj %}{{ user_obj.email }}{% else %}{{request.POST.email}}{% endif %}" {% if user_obj and not user_obj.is_staff %} readonly=""{% endif %}>
<input type="text" class="form-control" name="email" value="{% if user_obj %}{{ user_obj.email }}{% else %}{{request.POST.email}}{% endif %}" {% if user_obj %} readonly=""{% endif %}>
</div>
<span class="error">{{ errors.email }}</span>
@ -52,8 +56,12 @@
<div class="filter_col col-md-12">
<div class="form-group">
<label for="id_role">User Role{% if user_form.role.field.required %}<span class="error">*</span>{% endif %}</label>
{% if request.user.role == 'ADMIN' %}
{{ user_form.role }}
{% if request.user.role == 'ADMIN' or request.user.is_superuser %}
<select name="role">
{% for key, value in form.role.field.choices %}
<option value="{{key}}" {% if value == user_obj.role %}selected="selected"{% elif user_obj.is_superuser and value == "ADMIN" %}selected{% endif %}>{{value}}</option>
{% endfor %}
</select>
{% else %}
<select name="role">
<option value="{{user_obj.role}}">{{user_obj.role}}</option>

View file

@ -76,6 +76,7 @@
<th width="20%" style="text-align:center;">First Name</th>
<th width="20%" style="text-align:center;">Username</th>
<th width="20%" style="text-align:center;">Email Address</th>
<th width="8%" style="text-align:center;">User Role</th>
<th width="15%" style="text-align:center;">Status</th>
<th width="20%" style="text-align:center;">Actions</th>
</tr>
@ -92,6 +93,7 @@
<td>{{ user.first_name }}</td>
<td>{{ user.username }}</td>
<td>{{ user.email }}</td>
<td>{% if user.is_superuser %} ADMIN {% else %} {{user.role}} {% endif %}</td>
<td>
{% if user.is_active == True %}
Active
@ -101,8 +103,10 @@
</td>
<td class="actions">
<!-- <a href="{% url 'common:view_user' user.id %}" class="btn btn-info view"><i class="fas fa-eye"></i>View</a> -->
{% if request.user.id != user.id and user.email != "admin@micropyramid.com" %}
<a href="{% url 'common:edit_user' user.id %}" class="btn btn-success edit"><i class="fas fa-pencil-alt"></i>Edit</a>
<a href="{% url 'common:remove_user' user.id %}" class="btn btn-danger trash" {% if request.user.email == user.email or user.role == "ADMIN" %} style="visibility: hidden;" {% endif %}><i class="fas fa-trash-alt"></i>Delete</a>
{% endif %}
<a href="{% url 'common:remove_user' user.id %}" class="btn btn-danger trash" {% if request.user.email == user.email or user.role == "ADMIN" or user.is_superuser %} style="visibility: hidden;" {% endif %}><i class="fas fa-trash-alt"></i>Delete</a>
</td>
</tr>
{% endfor %}

View file

@ -1,6 +1,6 @@
from django.contrib.auth import views as auth_views
from django.urls import path
from django.urls import path, re_path
from common.views import (
HomeView, LoginView, ForgotPasswordView, LogoutView, ChangePasswordView, ProfileView,
UsersListView, CreateUserView, UpdateUserView, UserDetailView, UserDeleteView)
@ -24,8 +24,12 @@ urlpatterns = [
path('users/<int:pk>/view/', UserDetailView.as_view(), name='view_user'),
path('users/<int:pk>/delete/', UserDeleteView.as_view(), name='remove_user'),
path('password-reset/', auth_views.password_reset, name='password_reset'),
path('password-reset/done/', auth_views.password_reset_done, name='password_reset_done'),
path('reset/uidb64>/<token>/', auth_views.password_reset_confirm, name='password_reset_confirm'),
path('reset/done/', auth_views.password_reset_complete, name='password_reset_complete'),
path(
'password-reset/', auth_views.PasswordResetView.as_view(), name='password_reset'),
path('password-reset/done/', auth_views.PasswordResetDoneView.as_view(), name='password_reset_done'),
path(
'reset/<uidb64>/<token>/', auth_views.PasswordResetConfirmView.as_view(), name='password_reset_confirm'),
path('reset/done/', auth_views.PasswordResetCompleteView.as_view(), name='password_reset_complete'),
]

View file

@ -2,8 +2,9 @@ from django.contrib.auth import logout, authenticate, login
from django.contrib.auth.hashers import check_password
from django.contrib.auth.mixins import LoginRequiredMixin, AccessMixin
from django.http import HttpResponseRedirect
from django.shortcuts import render, redirect
from django.views.generic import CreateView, UpdateView, DetailView, TemplateView, View, DeleteView
from django.shortcuts import render, redirect, get_object_or_404
from django.views.generic import (
CreateView, UpdateView, DetailView, TemplateView, View, DeleteView)
from common.models import User
from common.forms import UserForm, LoginForm, ChangePasswordForm
@ -15,9 +16,9 @@ class AdminRequiredMixin(AccessMixin):
return self.handle_no_permission()
self.raise_exception = True
if not request.user.role == "ADMIN":
return self.handle_no_permission()
return super().dispatch(request, *args, **kwargs)
if not request.user.is_superuser:
return self.handle_no_permission()
return super(AdminRequiredMixin, self).dispatch(request, *args, **kwargs)
class HomeView(LoginRequiredMixin, TemplateView):
template_name = "index.html"
@ -175,8 +176,11 @@ class UpdateUserView(LoginRequiredMixin, UpdateView):
template_name = "create.html"
def form_valid(self, form):
form.save()
if self.request.user.role == "ADMIN":
user = form.save(commit=False)
if user.role == "USER":
user.is_superuser = False
user.save()
if self.request.user.role == "ADMIN" or self.request.user.is_superuser:
return redirect("common:users_list")
return redirect("common:profile")
@ -200,4 +204,3 @@ class UserDeleteView(AdminRequiredMixin, DeleteView):
self.object = self.get_object()
self.object.delete()
return redirect("common:users_list")

View file

@ -21,3 +21,6 @@ class Contact(models.Model):
def __str__(self):
return self.first_name
class Meta:
unique_together = (("email", ),)

View file

@ -1,9 +1,12 @@
from django.contrib.auth.mixins import LoginRequiredMixin
from django.db.models import Q
from django.http import JsonResponse
from django.shortcuts import get_object_or_404, redirect
from django.views.generic import CreateView, UpdateView, DetailView, TemplateView, View
from django.urls import reverse
from django.views.generic import (
CreateView, UpdateView, DetailView, ListView, TemplateView, View, DeleteView)
from accounts.models import Account
from common.models import User, Comment, Team
from common.models import User, Address, Comment, Team
from common.forms import BillingAddressForm
from common.utils import COUNTRIES
from contacts.models import Contact
@ -63,16 +66,17 @@ class CreateContactView(LoginRequiredMixin, CreateView):
form = self.get_form()
address_form = BillingAddressForm(request.POST)
if form.is_valid() and address_form.is_valid():
return self.form_valid(form, address_form)
ddress_obj = address_form.save()
contact_obj = form.save(commit=False)
contact_obj.address = ddress_obj
contact_obj.created_by = self.request.user
contact_obj.save()
return self.form_valid(form)
else:
return self.form_invalid(form, address_form)
return self.form_invalid(form)
def form_valid(self, form, address_form):
address_obj = address_form.save()
contact_obj = form.save(commit=False)
contact_obj.address = address_obj
contact_obj.created_by = self.request.user
contact_obj.save()
def form_valid(self, form):
contact_obj = form.save(commit=True)
if self.request.POST.getlist('assigned_to', []):
contact_obj.assigned_to.add(*self.request.POST.getlist('assigned_to'))
if self.request.POST.getlist('teams', []):
@ -84,7 +88,8 @@ class CreateContactView(LoginRequiredMixin, CreateView):
else:
return redirect('contacts:list')
def form_invalid(self, form, address_form):
def form_invalid(self, form):
address_form = BillingAddressForm(self.request.POST)
if self.request.is_ajax():
return JsonResponse({'error': True, 'contact_errors': form.errors,
'address_errors': address_form.errors})
@ -148,15 +153,16 @@ class UpdateContactView(LoginRequiredMixin, UpdateView):
form = self.get_form()
address_form = BillingAddressForm(request.POST, instance=address_obj)
if form.is_valid() and address_form.is_valid():
return self.form_valid(form, address_form)
addres_obj = address_form.save()
contact_obj = form.save(commit=False)
contact_obj.address = addres_obj
contact_obj.save()
return self.form_valid(form)
else:
return self.form_invalid(form, address_form)
return self.form_invalid(form)
def form_valid(self, form, address_form):
addres_obj = address_form.save()
def form_valid(self, form):
contact_obj = form.save(commit=False)
contact_obj.address = addres_obj
contact_obj.save()
contact_obj.assigned_to.clear()
contact_obj.teams.clear()
if self.request.POST.getlist('assigned_to', []):
@ -167,7 +173,9 @@ class UpdateContactView(LoginRequiredMixin, UpdateView):
return JsonResponse({'error': False})
return redirect("contacts:list")
def form_invalid(self, form, address_form):
def form_invalid(self, form):
address_obj = self.object.address
address_form = BillingAddressForm(self.request.POST, instance=address_obj)
if self.request.is_ajax():
return JsonResponse({'error': True, 'contact_errors': form.errors,
'address_errors': address_form.errors})

View file

@ -13,5 +13,5 @@ urlpatterns = [
path('cases/', include('cases.urls', namespace="cases")),
path('emails/', include('emails.urls', namespace="emails")),
# path('planner/', include('planner.urls', namespace="planner")),
path('logout/', views.logout, {'next_page': '/login/'}, name="logout"),
path('logout/', views.LogoutView, {'next_page': '/login/'}, name="logout"),
]

View file

@ -1,4 +1,4 @@
Django==2.0.7
Django==2.1.1
django-simple-pagination==1.1.8
pytz==2018.3
psycopg2-binary==2.7.4

View file

@ -760,4 +760,23 @@ padding:0px !important;
.created_information{
padding-left: 15px;
margin:10px 0;
}
}
.pagination{
li{
a{
padding: 5px 10px;
border: 1px solid #ddd;
font-weight: 600;
}
.active{
background: #369cbe;
padding: 5px 10px;
border: 1px solid #369cbe;
color: #fff;
}
}
}
.text-center {
justify-content: center!important;
}

View file

@ -22,14 +22,14 @@
<!-- header starts here -->
<header>
<nav class="navbar navbar-expand-lg navbar-dark fixed-top">
<a class="navbar-brand" href="#">Django CRM</a>
<a class="navbar-brand" href="{% url 'common:home' %}">Django CRM</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
{% if request.user.is_authenticated %}
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
{% if request.user.role == "ADMIN" %}
{% if request.user.role == "ADMIN" or request.user.is_superuser %}
<li class="nav-item"><a class="nav-link" id="users" href="{% url 'common:users_list' %}">Users</a></li>
{% endif %}
<li class="nav-item"><a class="nav-link" id="accounts" href="{% url 'accounts:list' %}">Accounts</a></li>
@ -52,8 +52,8 @@
<b class="caret"></b></a>
{% endwith %}
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
{% if request.user.role == "USER" %}
<a class="dropdown-item" href="{% url 'common:change_password' %}"><i class="fas fa-key"></i> Change Password</a>
{% if request.user.email != "admin@micropyramid.com" %}
<a class="dropdown-item" href="/change-password/"><i class="fas fa-key"></i> Change Password</a>
{% endif %}
<a class="dropdown-item" href="{% url 'common:profile' %}"><i class="fas fa-user"></i> Profile</a>
<a class="dropdown-item" href="{% url 'common:logout' %}"><i class="fas fa-sign-out-alt"></i> Logout</a>

View file

@ -8,7 +8,7 @@
<div class="card">
<div class="card-body">
<div class="card-title">
Change Passowrd
Change Password
</div>
<div class="row marl no-gutters">
<div class="col-md-12">
@ -47,7 +47,7 @@
<br>
<div class="row marl buttons_row form_btn_row text-center">
<button class="btn btn-default save" type="submit">Change Password</button>
<button class="btn btn-default" type="reset">Cancel</button>
<button class="btn btn-default"><a href="{% url 'common:profile'%}" style="color:inherit;">Cancel</a></button>
</div>
</div>
</div>

View file

@ -21,7 +21,9 @@
</div>
</span> -->
</h5>
{% if not request.user.role == "ADMIN" and not request.user.is_superuser %}
<a href="{% url 'common:edit_user' user_obj.id %}" class="btn btn-success edit">Edit</a>
{% endif %}
</div>
<div class="row marl no-gutters">
<div class="col-md-8">