Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
nopaque
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SFB 1288 - INF
nopaque
Commits
777151b2
Commit
777151b2
authored
2 years ago
by
Inga Kirschnick
Browse files
Options
Downloads
Plain Diff
Merge branch 'public-corpus' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into public-corpus
parents
c14abf52
b8e63d23
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
app/contributions/spacy_nlp_pipeline_models/json_routes.py
+2
-2
2 additions, 2 deletions
app/contributions/spacy_nlp_pipeline_models/json_routes.py
app/users/routes.py
+2
-2
2 additions, 2 deletions
app/users/routes.py
app/users/utils.py
+1
-1
1 addition, 1 deletion
app/users/utils.py
with
5 additions
and
5 deletions
app/contributions/spacy_nlp_pipeline_models/json_routes.py
+
2
−
2
View file @
777151b2
...
...
@@ -7,7 +7,7 @@ from app.models import SpaCyNLPPipelineModel
from
..
import
bp
@bp.route
(
'
/spacy-nlp-pipeline-models<hashid:spacy_nlp_pipeline_model_id>
'
,
methods
=
[
'
DELETE
'
])
@bp.route
(
'
/spacy-nlp-pipeline-models
/
<hashid:spacy_nlp_pipeline_model_id>
'
,
methods
=
[
'
DELETE
'
])
@login_required
@content_negotiation
(
produces
=
'
application/json
'
)
def
delete_spacy_model
(
spacy_nlp_pipeline_model_id
):
...
...
@@ -32,7 +32,7 @@ def delete_spacy_model(spacy_nlp_pipeline_model_id):
return
resonse_data
,
202
@bp.route
(
'
/spacy-nlp-pipeline-models<hashid:spacy_nlp_pipeline_model_id>/is_public
'
,
methods
=
[
'
PUT
'
])
@bp.route
(
'
/spacy-nlp-pipeline-models
/
<hashid:spacy_nlp_pipeline_model_id>/is_public
'
,
methods
=
[
'
PUT
'
])
@login_required
@permission_required
(
'
CONTRIBUTE
'
)
@content_negotiation
(
consumes
=
'
application/json
'
,
produces
=
'
application/json
'
)
...
...
This diff is collapsed.
Click to expand it.
app/users/routes.py
+
2
−
2
View file @
777151b2
...
...
@@ -26,7 +26,7 @@ from .utils import (
@bp.route
(
''
)
@register_breadcrumb
(
bp
,
'
.
'
,
'
Users
'
)
@register_breadcrumb
(
bp
,
'
.
'
,
'
<i class=
"
material-icons left
"
>group</i>
Users
'
)
@login_required
def
users
():
return
redirect
(
url_for
(
'
main.social_area
'
,
_anchor
=
'
users
'
))
...
...
@@ -65,7 +65,7 @@ def user(user_id):
def
profile_avatar
(
user_id
):
user
=
User
.
query
.
get_or_404
(
user_id
)
if
user
.
avatar
is
None
:
abort
(
404
)
return
redirect
(
url_for
(
'
static
'
,
filename
=
'
images/default_avatar.png
'
)
)
if
not
user
.
is_public
and
not
(
user
==
current_user
or
current_user
.
is_administrator
()):
abort
(
403
)
return
send_from_directory
(
...
...
This diff is collapsed.
Click to expand it.
app/users/utils.py
+
1
−
1
View file @
777151b2
...
...
@@ -11,7 +11,7 @@ def user_dynamic_list_constructor():
user
=
User
.
query
.
get_or_404
(
user_id
)
return
[
{
'
text
'
:
user
.
username
,
'
text
'
:
f
'
<i class=
"
material-icons left
"
>account_circle</i>
{
user
.
username
}
'
,
'
url
'
:
url_for
(
'
.user
'
,
user_id
=
user_id
)
}
]
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