Merge origin into fork

ChicoState · May 8, 2020 · 4eea9cd · 4eea9cd
2 parents 3cca389 + 9dc5889
commit 4eea9cd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/myapp/forms.py b/myapp/forms.py
@@ -52,7 +52,10 @@ class IssueForm(forms.Form):
 
 	issue_type = forms.CharField(
 		label='Issue Type',
-		widget=forms.Select(choices=ISSUE_CHOICES),
+		widget=forms.Select(
+			choices=ISSUE_CHOICES,
+			attrs={'class': 'form-control'}
+		),
 		required=True
 	)
 
@@ -345,7 +348,10 @@ class EditIssueForm(forms.Form):
 
 	issue_type = forms.CharField(
 		label='Issue Type',
-		widget=forms.Select(choices=ISSUE_CHOICES),
+		widget=forms.Select(
+			choices=ISSUE_CHOICES,
+			attrs={'class': 'form-control'}
+		),
 		required=True
 	)
 

diff --git a/myapp/views.py b/myapp/views.py
@@ -347,5 +347,10 @@ def edit_ticket(request, id):
 			}
 			return render(request, "editticket.html", context=context)
 		else:
+<<<<<<< HEAD
 			return redirect("/viewmyissues")
 
+=======
+			return redirect("/viewmysubmittedissues.html")
+
+>>>>>>> 9dc5889060e9532d6f7df1dda408225c4a5bed8e