Commit a4848f60 authored by c24b's avatar c24b

BACK access user params

parent 0030d93c
...@@ -21,7 +21,7 @@ class User(Base): ...@@ -21,7 +21,7 @@ class User(Base):
is_active = Column(Boolean(), default=True) is_active = Column(Boolean(), default=True)
last_login = Column(DateTime(timezone=False)) last_login = Column(DateTime(timezone=False))
date_joined = Column(DateTime(timezone=False), default=datetime.now) date_joined = Column(DateTime(timezone=False), default=datetime.now)
def contacts(self): def contacts(self):
"""get all contacts in relation with the user""" """get all contacts in relation with the user"""
Friend = aliased(User) Friend = aliased(User)
......
...@@ -82,7 +82,7 @@ def docs_by_sources(request, project_id, corpus_id): ...@@ -82,7 +82,7 @@ def docs_by_sources(request, project_id, corpus_id):
'corpus' : corpus, 'corpus' : corpus,
'resourcename' : get_resource(source_type)['name'], 'resourcename' : get_resource(source_type)['name'],
'user': request.user, 'user': request.user,
'user_parameters': get_node_user(user)["hyperdata"] 'user_parameters': get_node_user(user)["hyperdata"],
'view': 'sources' 'view': 'sources'
}, },
) )
......
...@@ -14,9 +14,12 @@ from django.utils.translation import ugettext_lazy ...@@ -14,9 +14,12 @@ from django.utils.translation import ugettext_lazy
import re import re
def get_node_user(user): def get_node_user(user):
node_user = session.query(Node).filter(Node.user_id == user.id & Node.typename== "USER") node_user = session.query(Node).filter(Node.user_id == user.id, Node.typename == "USER").first()
if node_user is None: if node_user is None:
node_user = Node(typename== "USER", user_id = user.id, name= user.name) node_user = Node(user_id = user.id,
typename = 'USER',
# username = user.name,
)
#default language for now is 'fr' #default language for now is 'fr'
node_user.hyperdata["language"] = "fr" node_user.hyperdata["language"] = "fr"
session.add(node_user) session.add(node_user)
...@@ -31,6 +34,7 @@ def overview(request): ...@@ -31,6 +34,7 @@ def overview(request):
''' '''
user = cache.User[request.user.id] user = cache.User[request.user.id]
print(user)
node_user = get_node_user(user) node_user = get_node_user(user)
# If POST method, creates a new project... # If POST method, creates a new project...
if request.method == 'POST': if request.method == 'POST':
...@@ -62,7 +66,7 @@ def overview(request): ...@@ -62,7 +66,7 @@ def overview(request):
# projects owned by the user # projects owned by the user
'number': user_projects.count(), 'number': user_projects.count(),
'projects': user_projects, 'projects': user_projects,
"user_parameters":node_user["hyperdata"], "user_parameters":node_user.hyperdata,
# projects owned by the user's contacts # projects owned by the user's contacts
'common_users': (contact for contact, projects in contacts_projects), 'common_users': (contact for contact, projects in contacts_projects),
'common_projects': sum((projects for contact, projects in contacts_projects), []), 'common_projects': sum((projects for contact, projects in contacts_projects), []),
...@@ -184,7 +188,7 @@ def project(request, project_id): ...@@ -184,7 +188,7 @@ def project(request, project_id):
'form': NewCorpusForm, 'form': NewCorpusForm,
'user': request.user, 'user': request.user,
"user_parameters":node_user["hyperdata"], "user_parameters":node_user.hyperdata,
'date': datetime.now(), 'date': datetime.now(),
'project': project, 'project': project,
'donut': donut, 'donut': donut,
...@@ -204,7 +208,7 @@ def project(request, project_id): ...@@ -204,7 +208,7 @@ def project(request, project_id):
template_name = 'pages/projects/project.html', template_name = 'pages/projects/project.html',
request = request, request = request,
context = { context = {
"user_parameters":node_user["hyperdata"], "user_parameters":node_user.hyperdata,
'form': NewCorpusForm, 'form': NewCorpusForm,
'user': request.user, 'user': request.user,
'date': datetime.now(), 'date': datetime.now(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment