Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scodoc_issue_976
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
Model registry
Operate
Environments
Terraform modules
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
Louis Dormael
scodoc_issue_976
Commits
728ff179
Commit
728ff179
authored
3 months ago
by
Emmanuel Viennet
Browse files
Options
Downloads
Patches
Plain Diff
Fix API /formsemestres/with_description/query error handling. Tests ok.
parent
d6895bba
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/api/formsemestres.py
+10
-7
10 additions, 7 deletions
app/api/formsemestres.py
tests/api/test_api_permissions.py
+1
-0
1 addition, 0 deletions
tests/api/test_api_permissions.py
with
11 additions
and
7 deletions
app/api/formsemestres.py
+
10
−
7
View file @
728ff179
...
...
@@ -18,7 +18,7 @@ import datetime
import
io
from
operator
import
attrgetter
,
itemgetter
from
flask
import
g
,
make_response
,
request
from
flask
import
g
,
make_response
,
request
,
Response
from
flask_json
import
as_json
from
flask_login
import
current_user
,
login_required
from
flask_sqlalchemy.query
import
Query
...
...
@@ -101,7 +101,7 @@ def formsemestre_get_with_description(formsemestre_id: int):
return
sem
def
_list_formsemestres_query
()
->
Query
:
def
_list_formsemestres_query
()
->
Query
|
Response
:
"""
Recupère les formsemestres selon les arguments passés (request.args)
"""
etape_apo
=
request
.
args
.
get
(
"
etape_apo
"
)
annee_scolaire
=
request
.
args
.
get
(
"
annee_scolaire
"
)
...
...
@@ -192,9 +192,10 @@ def formsemestres_query():
ine:<string:ine>
"""
formsemestres
=
_list_formsemestres_query
()
return
[
formsemestre
.
to_dict_api
()
for
formsemestre
in
formsemestres
]
formsemestres_or_reponse
=
_list_formsemestres_query
()
if
isinstance
(
formsemestres_or_reponse
,
Response
):
return
formsemestres_or_reponse
return
[
formsemestre
.
to_dict_api
()
for
formsemestre
in
formsemestres_or_reponse
]
@bp.route
(
"
/formsemestre/<int:formsemestre_id>/edit
"
,
methods
=
[
"
POST
"
])
...
...
@@ -882,9 +883,11 @@ def formsemestres_with_description():
avec description externe pour AutoSco.
"""
formsemestre
:
FormSemestre
formsemestres
=
_list_formsemestres_query
()
formsemestres_or_reponse
=
_list_formsemestres_query
()
if
isinstance
(
formsemestres_or_reponse
,
Response
):
return
formsemestres_or_reponse
res
=
[]
for
formsemestre
in
formsemestres
:
for
formsemestre
in
formsemestres
_or_reponse
:
sem
=
formsemestre
.
to_dict_api
()
_add_description
(
formsemestre
,
sem
)
res
.
append
(
sem
)
...
...
This diff is collapsed.
Click to expand it.
tests/api/test_api_permissions.py
+
1
−
0
View file @
728ff179
...
...
@@ -73,6 +73,7 @@ def test_permissions(api_headers):
# par défaut, on passe tous les arguments de all_args
endpoint_args
=
{
"
api.formsemestres_query
"
:
{},
"
api.formsemestres_with_description
"
:
{
"
formsemestre_id
"
:
1
},
"
api.formsemestre_edt
"
:
{
"
formsemestre_id
"
:
1
,
},
...
...
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