Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
grady
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jan Maximilian Michal
grady
Commits
acba593d
Commit
acba593d
authored
8 years ago
by
Jan Maximilian Michal
Browse files
Options
Downloads
Patches
Plain Diff
removed old form and login template
parent
48dd14c0
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
core/templates/core/feedback_create.html
+0
-20
0 additions, 20 deletions
core/templates/core/feedback_create.html
core/templates/core/feedback_form.html
+2
-2
2 additions, 2 deletions
core/templates/core/feedback_form.html
core/views.py
+12
-10
12 additions, 10 deletions
core/views.py
with
14 additions
and
32 deletions
core/templates/core/feedback_create.html
deleted
100644 → 0
+
0
−
20
View file @
48dd14c0
{% extends 'base.html' %}
{% load staticfiles %}
{% block title %} Create Feedback {% endblock %}
{% block body_block %}
<div
class=
"page-header"
>
<h1>
Create Feedback
</h1>
</div>
<pre>
{{ submission.submission_text }}
</pre>
<div>
{{ feedback_form }}
</div>
{% endblock %}
This diff is collapsed.
Click to expand it.
core/templates/core/feedback_form.html
+
2
−
2
View file @
acba593d
{% extends "base.html" %}
{% extends "base.html" %}
{% block nav_title %} Create
--
Feedback {% endblock nav_title %}
{% block nav_title %} Create Feedback {% endblock nav_title %}
{% block title %} {% endblock %}
{% block title %} {% endblock %}
{% block body_block %}
{% block body_block %}
<div
class=
"page-header"
>
<div
class=
"page-header"
>
<h1>
Crea
ting
shit
</h1>
<h1>
Edi
ting
feedback
</h1>
</div>
</div>
<div>
<div>
...
...
This diff is collapsed.
Click to expand it.
core/views.py
+
12
−
10
View file @
acba593d
...
@@ -27,10 +27,12 @@ def index(request):
...
@@ -27,10 +27,12 @@ def index(request):
def
delegate_user
(
user
)
->
str
:
def
delegate_user
(
user
)
->
str
:
if
user
.
groups
.
filter
(
name
=
'
Tutors
'
).
exists
():
if
user
.
groups
.
filter
(
name
=
'
Tutors
'
).
exists
():
return
'
/tutor/
'
return
'
/tutor/
'
if
user
.
groups
.
filter
(
name
=
'
Reviewers
'
).
exists
():
el
if
user
.
groups
.
filter
(
name
=
'
Reviewers
'
).
exists
():
return
'
/reviewers/
'
return
'
/reviewers/
'
if
user
.
groups
.
filter
(
name
=
'
Students
'
).
exists
():
el
if
user
.
groups
.
filter
(
name
=
'
Students
'
).
exists
():
return
'
/students/
'
return
'
/students/
'
else
:
return
'
/
'
def
user_login
(
request
):
def
user_login
(
request
):
...
@@ -53,13 +55,13 @@ def user_login(request):
...
@@ -53,13 +55,13 @@ def user_login(request):
print
(
"
Invalid login details: {0}, {1}
"
.
format
(
username
,
password
))
print
(
"
Invalid login details: {0}, {1}
"
.
format
(
username
,
password
))
return
HttpResponse
(
"
Invalid login details supplied.
"
)
return
HttpResponse
(
"
Invalid login details supplied.
"
)
else
:
else
:
return
render
(
request
,
'
core/login.html
'
,
{}
)
return
HttpResponseRedirect
(
'
/
'
)
@login_required
(
login_url
=
'
/
login/
'
)
@login_required
(
login_url
=
'
/
'
)
def
user_logout
(
request
):
def
user_logout
(
request
):
logout
(
request
)
logout
(
request
)
return
HttpResponseRedirect
(
'
/
login/
'
)
return
HttpResponseRedirect
(
'
/
'
)
def
is_tutor
(
user
):
def
is_tutor
(
user
):
...
@@ -67,7 +69,7 @@ def is_tutor(user):
...
@@ -67,7 +69,7 @@ def is_tutor(user):
return
group
in
user
.
groups
.
all
()
return
group
in
user
.
groups
.
all
()
@user_passes_test
(
is_tutor
,
login_url
=
'
/
login/
'
)
@user_passes_test
(
is_tutor
,
login_url
=
'
/
'
)
def
tutor_startpage
(
request
):
def
tutor_startpage
(
request
):
context
=
{
context
=
{
'
tutor_name
'
:
request
.
user
.
username
,
'
tutor_name
'
:
request
.
user
.
username
,
...
@@ -76,7 +78,7 @@ def tutor_startpage(request):
...
@@ -76,7 +78,7 @@ def tutor_startpage(request):
return
render
(
request
,
'
core/tutor_startpage.html
'
,
context
)
return
render
(
request
,
'
core/tutor_startpage.html
'
,
context
)
@user_passes_test
(
is_tutor
,
login_url
=
'
/
login/
'
)
@user_passes_test
(
is_tutor
,
login_url
=
'
/
'
)
def
feedback
(
request
,
feedback_slug
):
def
feedback
(
request
,
feedback_slug
):
context
=
{
'
feedback
'
:
Feedback
.
objects
.
get
(
slug
=
feedback_slug
)}
context
=
{
'
feedback
'
:
Feedback
.
objects
.
get
(
slug
=
feedback_slug
)}
...
@@ -84,7 +86,7 @@ def feedback(request, feedback_slug):
...
@@ -84,7 +86,7 @@ def feedback(request, feedback_slug):
return
render
(
request
,
'
core/feedback.html
'
,
context
)
return
render
(
request
,
'
core/feedback.html
'
,
context
)
@user_passes_test
(
is_tutor
,
login_url
=
'
/
login/
'
)
@user_passes_test
(
is_tutor
,
login_url
=
'
/
'
)
def
create_feedback
(
request
):
def
create_feedback
(
request
):
Submission
.
assign_tutor
(
request
.
user
)
Submission
.
assign_tutor
(
request
.
user
)
feedback
=
Feedback
.
tutor_unfinished_feedback
(
request
.
user
)
feedback
=
Feedback
.
tutor_unfinished_feedback
(
request
.
user
)
...
@@ -105,7 +107,7 @@ class FeedbackEdit(UpdateView):
...
@@ -105,7 +107,7 @@ class FeedbackEdit(UpdateView):
template_name
=
'
core/feedback_form.html
'
template_name
=
'
core/feedback_form.html
'
success_url
=
'
/tutor/
'
success_url
=
'
/tutor/
'
@method_decorator
(
user_passes_test
(
is_tutor
,
login_url
=
'
/
login/
'
))
@method_decorator
(
user_passes_test
(
is_tutor
,
login_url
=
'
/
'
))
def
dispatch
(
self
,
*
args
,
**
kwargs
):
def
dispatch
(
self
,
*
args
,
**
kwargs
):
return
super
(
FeedbackEdit
,
self
).
dispatch
(
*
args
,
**
kwargs
)
return
super
(
FeedbackEdit
,
self
).
dispatch
(
*
args
,
**
kwargs
)
...
@@ -123,7 +125,7 @@ class FeedbackEdit(UpdateView):
...
@@ -123,7 +125,7 @@ class FeedbackEdit(UpdateView):
def
get_context_data
(
self
,
**
kwargs
):
def
get_context_data
(
self
,
**
kwargs
):
feedback
=
self
.
get_object
()
feedback
=
self
.
get_object
()
context
=
{
context
=
{
'
is_reviewed
'
:
not
feedback
.
of_reviewer
.
is_nu
ll
(),
'
is_reviewed
'
:
not
feedback
.
of_reviewer
.
a
ll
(),
'
submission
'
:
feedback
.
of_submission
,
'
submission
'
:
feedback
.
of_submission
,
'
submission_type
'
:
feedback
.
of_submission
.
type
,
'
submission_type
'
:
feedback
.
of_submission
.
type
,
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment