Skip to content

Commit adcbaa1

Browse files
ashwin31ashwin31
authored
Merge pull request #28 from ashwin31/ashwin_fixes
fixed user details
2 parents 3c3bc9b + 0fc7edf commit adcbaa1

File tree

13 files changed

+169
-169
lines changed

13 files changed

+169
-169
lines changed

Diff for: ‎common/tests.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@
33
from common.models import User
44

55

6-
class TestHomePage(TestCase):
6+
class ObjectsCreation(object):
77
def setUp(self):
88
self.client = Client()
9-
self.user = User.objects.create_superuser(
10-
'[email protected]', 'username', 'password')
11-
user_login = self.client.login(username='[email protected]', password='password')
9+
self.user = User.objects.create(first_name="admin", username='admin', email='[email protected]')
10+
self.user.set_password('admin123')
11+
self.user.save()
12+
user_login = self.client.login(username='[email protected]', password='admin123')
1213

14+
15+
class TestHomePage(ObjectsCreation, TestCase):
1316
def test_home_page(self):
1417
response = self.client.get('/')
18+
print(response)
1519
self.assertEqual(response.status_code, 200)
1620
if response.status_code == 200:
1721
self.assertIn("Micro", str(response.content))

Diff for: ‎common/views.py

+10-6
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,21 @@
88
from common.forms import UserForm, LoginForm
99

1010

11-
#@login_required
11+
@login_required
1212
def home(request):
1313
return render(request, 'index.html')
1414

1515

16+
@login_required
1617
def change_pass(request):
1718
return render(request, 'change_password.html')
1819

19-
def profile(request):
20-
return render(request, 'profile.html')
2120

21+
@login_required
22+
def profile(request):
23+
user = request.user
24+
user_obj = User.objects.filter(id=user.id)
25+
return render(request, "profile.html", {'user_obj': user_obj})
2226

2327
@csrf_exempt
2428
def login_crm(request):
@@ -33,18 +37,18 @@ def login_crm(request):
3337
login(request, user)
3438
return HttpResponseRedirect('/')
3539
else:
36-
print("User is Inactive")
40+
return render(request, "login.html", {"error": True, "inactiveuser": form.errors})
3741
else:
38-
print("User is None")
42+
return render(request, "login.html", {"error": True, "usernone": form.errors})
3943
else:
4044
return render(request, "login.html", {"error": True, "errors": form.errors})
4145
return render(request, 'login.html')
4246

4347

44-
@login_required
4548
@csrf_exempt
4649
def logout_crm(request):
4750
logout(request)
51+
request.session.flush()
4852
return redirect("common:login")
4953

5054

Diff for: ‎static/css/main.scss

+10-1
Original file line numberDiff line numberDiff line change
@@ -624,4 +624,13 @@ $color_2: #000;
624624
height: 125px;
625625
border:4px solid #eee;
626626
}
627-
}
627+
}
628+
629+
.error {
630+
color: red;
631+
}
632+
633+
.error ul {
634+
list-style-type: none;
635+
padding: 0px;
636+
}

Diff for: ‎templates/accounts/create_account.html

+24-24
Original file line numberDiff line numberDiff line change
@@ -54,44 +54,44 @@
5454
<div class="col-md-6">
5555
<div class="filter_col col-md-12">
5656
<div class="form-group">
57-
<label for="exampleInputEmail1" class="required">Name</label>
57+
<label for="exampleInputEmail1" class="required">Name{% if account_form.name.field.required %}<span class="error">*</span>{% endif %}</label>
5858
{{ account_form.name }}
59-
{{ account_form.name.errors }}
59+
<span class="error">{{ account_form.name.errors }}</span>
6060
</div>
6161
</div>
6262
<div class="filter_col col-md-12">
6363
<div class="form-group">
64-
<label for="exampleInputEmail1">Website</label>
64+
<label for="exampleInputEmail1">Website{% if account_form.website.field.required %}<span class="error">*</span>{% endif %}</label>
6565
{{ account_form.website }}
66-
{{ account_form.website.errors }}
66+
<span class="error">{{ account_form.website.errors }}</span>
6767
</div>
6868
</div>
6969
<div class="filter_col col-md-12">
7070
<div class="form-group">
71-
<label for="exampleInputEmail1" class="required">Phone</label>
71+
<label for="exampleInputEmail1" class="required">Phone{% if account_form.phone.field.required %}<span class="error">*</span>{% endif %}</label>
7272
{{ account_form.phone }}
73-
{{ account_form.phone.errors }}
73+
<span class="error">{{ account_form.phone.errors }}</span>
7474
</div>
7575
</div>
7676
<div class="filter_col col-md-12">
7777
<div class="form-group ">
78-
<label for="exampleInputEmail1" class="required">Email Address</label>
78+
<label for="exampleInputEmail1" class="required">Email Address{% if account_form.email.field.required %}<span class="error">*</span>{% endif %}</label>
7979
{{ account_form.email }}
80-
{{ account_form.email.errors }}
80+
<span class="error">{{ account_form.email.errors }}</span>
8181
</div>
8282
</div>
8383
<div class="filter_col col-md-12">
8484
<div class="form-group">
85-
<label for="exampleInputEmail1">Industry</label>
85+
<label for="exampleInputEmail1">Industry{% if account_form.industry.field.required %}<span class="error">*</span>{% endif %}</label>
8686
{{ account_form.industry }}
87-
{{ account_form.industry.errors }}
87+
<span class="error">{{ account_form.industry.errors }}</span>
8888
</div>
8989
</div>
9090
<div class="filter_col col-md-12">
9191
<div class="form-group">
92-
<label for="exampleInputEmail1">Description</label>
92+
<label for="exampleInputEmail1">Description{% if account_form.description.field.required %}<span class="error">*</span>{% endif %}</label>
9393
{{ account_form.description }}
94-
{{ account_form.description.errors }}
94+
<span class="error">{{ account_form.description.errors }}</span>
9595
</div>
9696
</div>
9797
</div>
@@ -100,26 +100,26 @@
100100
<div class="form-group">
101101
<label for="exampleInputEmail1">Billing Address</label>
102102
{{ billing_form.address_line }}
103-
{{ billing_form.address_line.errors }}
103+
<span class="error">{{ billing_form.address_line.errors }}</span>
104104
</div>
105105
{{ billing_form.street }}
106-
{{ billing_form.street.errors }}
106+
<span class="error">{{ billing_form.street.errors }}</span>
107107
<div class="row" style="margin-top: 10px;">
108108
<div class="col-md-4">
109109
{{ billing_form.city }}
110-
{{ billing_form.city.errors }}
110+
<span class="error">{{ billing_form.city.errors }}</span>
111111
</div>
112112
<div class="col-md-4">
113113
{{ billing_form.state }}
114-
{{ billing_form.state.errors }}
114+
<span class="error">{{ billing_form.state.errors }}</span>
115115
</div>
116116
<div class="col-md-4">
117117
{{ billing_form.postcode }}
118-
{{ billing_form.postcode.errors }}
118+
<span class="error">{{ billing_form.postcode.errors }}</span>
119119
</div>
120120
<div class="col-md-12" style="margin-top: 10px;">
121121
{{ billing_form.country }}
122-
{{ billing_form.country.errors }}
122+
<span class="error">{{ billing_form.country.errors }}</span>
123123
</div>
124124
</div>
125125
</div>
@@ -133,26 +133,26 @@ <h6 style="color:white;">Copy Address</h6>
133133
<div class="form-group">
134134
<label for="exampleInputEmail1">Shipping Address</label>
135135
{{ shipping_form.address_line }}
136-
{{ shipping_form.address_line.errors }}
136+
<span class="error">{{ shipping_form.address_line.errors }}</span>
137137
</div>
138138
{{ shipping_form.street }}
139-
{{ shipping_form.street.errors }}
139+
<span class="error">{{ shipping_form.street.errors }}</span>
140140
<div class="row" style="margin-top: 10px;">
141141
<div class="col-md-4">
142142
{{ shipping_form.city }}
143-
{{ shipping_form.city.errors }}
143+
<span class="error">{{ shipping_form.city.errors }}</span>
144144
</div>
145145
<div class="col-md-4">
146146
{{ shipping_form.state }}
147-
{{ shipping_form.state.errors }}
147+
<span class="error">{{ shipping_form.state.errors }}</span>
148148
</div>
149149
<div class="col-md-4">
150150
{{ shipping_form.postcode }}
151-
{{ shipping_form.postcode.errors }}
151+
<span class="error">{{ shipping_form.postcode.errors }}</span>
152152
</div>
153153
<div class="col-md-12" style="margin-top: 10px;">
154154
{{ shipping_form.country }}
155-
{{ shipping_form.country.errors }}
155+
<span class="error">{{ shipping_form.country.errors }}</span>
156156
</div>
157157
</div>
158158
</div>

Diff for: ‎templates/cases/create_cases.html

+15-15
Original file line numberDiff line numberDiff line change
@@ -51,64 +51,64 @@
5151
<div class="col-md-6">
5252
<div class="filter_col col-md-12">
5353
<div class="form-group">
54-
<label for="id_name" class="required">Name</label>
54+
<label for="id_name" class="required">Name{% if case_form.name.field.required %}<span class="error">*</span>{% endif %}</label>
5555
{{ case_form.name }}
56-
<span>{{ case_form.name.errors }}</span>
56+
<span class="error">{{ case_form.name.errors }}</span>
5757
</div>
5858
</div>
5959
<div class="filter_col col-md-12">
6060
<div class="form-group">
61-
<label for="id_status" class="required">Status</label>
61+
<label for="id_status" class="required">Status{% if case_form.status.field.required %}<span class="error">*</span>{% endif %}</label>
6262
{{ case_form.status }}
63-
<span>{{ case_form.status.errors }}</span>
63+
<span class="error">{{ case_form.status.errors }}</span>
6464
</div>
6565
</div>
6666
<div class="filter_col col-md-12">
6767
<div class="form-group">
68-
<label for="id_priority" class="required">Priority</label>
68+
<label for="id_priority" class="required">Priority{% if case_form.priority.field.required %}<span class="error">*</span>{% endif %}</label>
6969
{{ case_form.priority }}
70-
<span>{{ case_form.priority.errors }}</span>
70+
<span class="error">{{ case_form.priority.errors }}</span>
7171
</div>
7272
</div>
7373
<div class="filter_col col-md-12">
7474
<div class="form-group">
75-
<label for="id_case_type">Type of Case</label>
75+
<label for="id_case_type">Type of Case{% if case_form.case_type.field.required %}<span class="error">*</span>{% endif %}</label>
7676
{{ case_form.case_type }}
77-
<span>{{ case_form.case_type.errors }}</span>
77+
<span class="error">{{ case_form.case_type.errors }}</span>
7878
</div>
7979
</div>
8080
<div class="filter_col col-md-12">
8181
<div class="form-group">
82-
<label for="exampleInputEmail1" class="required">Close Date</label>
82+
<label for="exampleInputEmail1" class="required">Close Date{% if case_form.closed_on.field.required %}<span class="error">*</span>{% endif %}</label>
8383
<div class='input-group date' id='datepicker1'>
8484
{{ case_form.closed_on }}
8585
<span class="input-group-addon">
8686
<span class="glyphicon glyphicon-calendar"></span>
8787
</span>
8888
</div>
89-
<span>{{ case_form.closed_on.errors }}</span>
89+
<span class="error">{{ case_form.closed_on.errors }}</span>
9090
</div>
9191
</div>
9292
</div>
9393
<div class="col-md-6">
9494
<div class="filter_col col-md-12">
9595
<div class="form-group">
96-
<label for="id_account">Account</label>
96+
<label for="id_account">Account{% if case_form.account.field.required %}<span class="error">*</span>{% endif %}</label>
9797
{{ case_form.account }}
98-
<span> {{case_form.account.errors}}</span>
98+
<span class="error">{{case_form.account.errors}}</span>
9999
</div>
100100
</div>
101101
<div class="filter_col col-md-12">
102102
<div class="form-group">
103-
<label for="id_contacts">Contacts</label>
103+
<label for="id_contacts">Contacts{% if case_form.contacts.field.required %}<span class="error">*</span>{% endif %}</label>
104104
{{ case_form.contacts }}
105105
</div>
106106
</div>
107107
<div class="filter_col col-md-12">
108108
<div class="form-group">
109-
<label for="id_description">Description</label>
109+
<label for="id_description">Description{% if case_form.description.field.required %}<span class="error">*</span>{% endif %}</label>
110110
{{ case_form.description }}
111-
<span>{{ case_form.description.errors }}</span>
111+
<span class="error">{{ case_form.description.errors }}</span>
112112
</div>
113113
</div>
114114
</div>

Diff for: ‎templates/contacts/create_contact.html

+16-16
Original file line numberDiff line numberDiff line change
@@ -52,38 +52,38 @@
5252
<div class="col-md-6">
5353
<div class="filter_col col-md-12">
5454
<div class="form-group">
55-
<label for="exampleInputEmail1" class="required">Name</label>
55+
<label for="exampleInputEmail1" class="required">Name{% if contact_form.first_name.field.required %}<span class="error">*</span>{% endif %}</label>
5656
<div class="row">
5757
<div class="filter_col col-md-6">
5858
{{ contact_form.first_name }}
59-
{{ contact_form.first_name.errors }}
59+
<span class="error">{{ contact_form.first_name.errors }}</span>
6060
</div>
6161
<div class="filter_col col-md-6">
6262
{{ contact_form.last_name }}
63-
{{ contact_form.last_name.errors }}
63+
<span class="error">{{ contact_form.last_name.errors }}</span>
6464
</div>
6565
</div>
6666
</div>
6767
</div>
6868
<div class="filter_col col-md-12">
6969
<div class="form-group">
70-
<label for="exampleInputEmail1">Account</label>
70+
<label for="exampleInputEmail1">Account{% if contact_form.account.field.required %}<span class="error">*</span>{% endif %}</label>
7171
{{ contact_form.account }}
72-
{{ contact_form.account.errors }}
72+
<span class="error">{{ contact_form.account.errors }}</span>
7373
</div>
7474
</div>
7575
<div class="filter_col col-md-12">
7676
<div class="form-group ">
77-
<label for="exampleInputEmail1" class="required" >Phone</label>
77+
<label for="exampleInputEmail1" class="required" >Phone{% if contact_form.phone.field.required %}<span class="error">*</span>{% endif %}</label>
7878
{{ contact_form.phone }}
79-
{{ contact_form.phone.errors }}
79+
<span class="error">{{ contact_form.phone.errors }}</span>
8080
</div>
8181
</div>
8282
<div class="filter_col col-md-12">
8383
<div class="form-group ">
84-
<label for="exampleInputEmail1" class="required" >Email Address</label>
84+
<label for="exampleInputEmail1" class="required" >Email Address{% if contact_form.email.field.required %}<span class="error">*</span>{% endif %}</label>
8585
{{ contact_form.email }}
86-
{{ contact_form.email.errors }}
86+
<span class="error">{{ contact_form.email.errors }}</span>
8787
</div>
8888
</div>
8989
</div>
@@ -92,35 +92,35 @@
9292
<div class="form-group">
9393
<label for="exampleInputEmail1">Address</label>
9494
{{ address_form.address_line }}
95-
{{ address_form.address_line.errors }}
95+
<span class="error">{{ address_form.address_line.errors }}</span>
9696
</div>
9797
{{ address_form.street }}
98-
{{ address_form.street.errors }}
98+
<span class="error">{{ address_form.street.errors }}</span>
9999
<div class="row" style="margin-top: 10px;">
100100
<div class="col-md-4">
101101
{{ address_form.city }}
102102
{{ address_form.city.errors }}
103103
</div>
104104
<div class="col-md-4">
105105
{{ address_form.state }}
106-
{{ address_form.state.errors }}
106+
<span class="error">{{ address_form.state.errors }}</span>
107107
</div>
108108
<div class="col-md-4">
109109
{{ address_form.postcode }}
110-
{{ address_form.postcode.errors }}
110+
<span class="error">{{ address_form.postcode.errors }}</span>
111111
</div>
112112
<div class="col-md-12" style="margin-top: 10px;">
113113
{{ address_form.country }}
114-
{{ address_form.country.errors }}
114+
<span class="error">{{ address_form.country.errors }}</span>
115115
</div>
116116
</div>
117117
</div>
118118
<br clear="all">
119119
<div class="col-md-12">
120120
<div class="form-group">
121-
<label for="exampleInputEmail1">Description</label>
121+
<label for="exampleInputEmail1">Description{% if contact_form.description.field.required %}<span class="error">*</span>{% endif %}</label>
122122
{{ contact_form.description }}
123-
{{ contact_form.description.errors }}
123+
<span class="error">{{ contact_form.description.errors }}</span>
124124
</div>
125125
</div>
126126
</div>

0 commit comments

Comments
 (0)