Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Project Allocator
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
edtech
Project Allocator
Commits
f823500c
Commit
f823500c
authored
2 years ago
by
Andrea Callia D'Iddio
Browse files
Options
Downloads
Patches
Plain Diff
Feat: support checking deadline per category when creating or deleting a project.
parent
1efe055b
No related branches found
No related tags found
1 merge request
!18
Support specific deadline for each category of project.
Pipeline
#381094
failed
2 years ago
Stage: lint
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/views/staff.py
+19
-16
19 additions, 16 deletions
app/views/staff.py
with
19 additions
and
16 deletions
app/views/staff.py
+
19
−
16
View file @
f823500c
import
sys
from
datetime
import
datetime
from
flask
import
Blueprint
,
flash
,
redirect
,
render_template
,
request
,
url_for
...
...
@@ -64,7 +63,6 @@ def projects():
.
filter
(
Project
.
deleted
.
is_
(
None
))
.
all
()
)
sys
.
stderr
.
write
(
str
(
allow_edit
))
return
render_template
(
"
pages/staff/projects.html
"
,
own_projects
=
own_projects
,
...
...
@@ -74,10 +72,14 @@ def projects():
)
def
is_deadline_expired_for_staff
(
category_code
):
category
=
Category
.
query
.
get
(
category_code
)
return
datetime
.
utcnow
()
>
category
.
deadline_for_staff_change
@bp.route
(
"
/projects/create
"
,
methods
=
[
"
GET
"
,
"
POST
"
])
@login_required
@staff_only
@only_before_deadline_for_staff
def
create_project
():
category_codes
:
list
[
str
]
=
(
Person
.
query
.
filter_by
(
username
=
current_user
.
username
).
first
().
categories
...
...
@@ -117,10 +119,13 @@ def create_project():
proposed_start_date
=
form
.
proposed_start_date
.
data
,
duration_in_weeks
=
form
.
duration_in_weeks
.
data
,
)
db
.
session
.
add
(
project
)
db
.
session
.
commit
()
if
project
.
on_behalf
:
shortlist_proposer
(
project
)
if
is_deadline_expired_for_staff
(
form
.
category
.
data
):
flash
(
messages
.
DEADLINE_EXPIRED_FOR_STAFF
)
else
:
db
.
session
.
add
(
project
)
db
.
session
.
commit
()
if
project
.
on_behalf
:
shortlist_proposer
(
project
)
return
redirect
(
url_for
(
"
staff.projects
"
))
elif
request
.
method
==
"
POST
"
:
if
form
.
category
.
data
not
in
category_codes
:
...
...
@@ -133,20 +138,18 @@ def create_project():
@bp.route
(
"
/projects/<project_id>/delete
"
)
@login_required
@staff_only
@only_before_deadline_for_staff
def
delete_project
(
project_id
):
can_delete
=
True
category_codes
:
list
[
str
]
=
(
Person
.
query
.
filter_by
(
username
=
current_user
.
username
).
first
().
categories
)
project
=
Project
.
query
.
get
(
project_id
)
if
not
project
:
can_delete
=
False
elif
project
.
category
not
in
category_codes
:
can_delete
=
False
elif
project
.
proposer
!=
current_user
.
username
:
c
an
_delete
=
False
if
can_delete
:
if
(
project
is
not
None
)
and
is_deadline_expired_for_staff
(
project
.
category
)
:
flash
(
messages
.
DEADLINE_EXPIRED_FOR_STAFF
)
elif
(
(
project
is
not
None
)
and
(
project
.
category
in
category_codes
)
an
d
(
project
.
proposer
==
current_user
.
username
)
)
:
project
.
deleted
=
datetime
.
utcnow
()
db
.
session
.
commit
()
else
:
...
...
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