Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
humanities
gargantext
Commits
22535f0a
Commit
22535f0a
authored
Mar 02, 2016
by
Romain Loth
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix user retrieval from cache (part 2/2)
parent
6182a4fa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
nodes.py
gargantext/views/api/nodes.py
+1
-1
projects.py
gargantext/views/pages/projects.py
+2
-2
No files found.
gargantext/views/api/nodes.py
View file @
22535f0a
...
@@ -13,7 +13,7 @@ _node_available_types = NODETYPES
...
@@ -13,7 +13,7 @@ _node_available_types = NODETYPES
def
_query_nodes
(
request
,
node_id
=
None
):
def
_query_nodes
(
request
,
node_id
=
None
):
user
=
cache
.
User
[
request
.
user
.
username
]
user
=
cache
.
User
[
request
.
user
.
id
]
# parameters validation
# parameters validation
parameters
=
get_parameters
(
request
)
parameters
=
get_parameters
(
request
)
parameters
=
validate
(
parameters
,
{
'type'
:
dict
,
'items'
:
{
parameters
=
validate
(
parameters
,
{
'type'
:
dict
,
'items'
:
{
...
...
gargantext/views/pages/projects.py
View file @
22535f0a
...
@@ -20,7 +20,7 @@ def overview(request):
...
@@ -20,7 +20,7 @@ def overview(request):
To each project, we can link a resource that can be an image.
To each project, we can link a resource that can be an image.
'''
'''
user
=
cache
.
User
[
request
.
user
.
username
]
user
=
cache
.
User
[
request
.
user
.
id
]
# If POST method, creates a new project...
# If POST method, creates a new project...
if
request
.
method
==
'POST'
:
if
request
.
method
==
'POST'
:
...
@@ -74,7 +74,7 @@ class NewCorpusForm(forms.Form):
...
@@ -74,7 +74,7 @@ class NewCorpusForm(forms.Form):
@
requires_auth
@
requires_auth
def
project
(
request
,
project_id
):
def
project
(
request
,
project_id
):
# current user
# current user
user
=
cache
.
User
[
request
.
user
.
username
]
user
=
cache
.
User
[
request
.
user
.
id
]
# viewed project
# viewed project
project
=
session
.
query
(
Node
)
.
filter
(
Node
.
id
==
project_id
)
.
first
()
project
=
session
.
query
(
Node
)
.
filter
(
Node
.
id
==
project_id
)
.
first
()
if
project
is
None
:
if
project
is
None
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment