Commit bfbb4dbb authored by PkSM3's avatar PkSM3

[UPDATE] permissions with lists (TODO for today)

parent fc1a2a09
......@@ -416,8 +416,7 @@ def newpaginatorJSON(request , corpus_id):
# documents = session.query(Node).filter(Node.parent_id==corpus_id , Node.type_id == type_document_id ).all()
docs = (session.query(Node)
.filter(Node.user_id == user_id
, Node.parent_id==corpus_id
.filter(Node.parent_id==corpus_id
, Node.type_id == type_document_id )
.all()
)
......
......@@ -125,9 +125,9 @@ class List(APIView):
def get(self, request, corpus_id , list_name ):
if not request.user.is_authenticated():
return JsonHttpResponse( {"request" : "forbidden"} )
corpus = session.query(Node).filter( Node.user_id==request.user.id , Node.id==corpus_id ).first()
if corpus==None:
return JsonHttpResponse( {"request" : "forbidden"} )
corpus = session.query(Node).filter( Node.id==corpus_id ).first()
# if corpus==None:
# return JsonHttpResponse( {"request" : "forbidden"} )
start_ = time.time()
list_name = list_name.title()+"List"
node_list = get_or_create_node(nodetype=list_name, corpus=corpus )
......@@ -162,9 +162,9 @@ class Ngrams(APIView):
def get(self, request, node_id):
if not request.user.is_authenticated():
return JsonHttpResponse( {"request" : "forbidden"} )
corpus = session.query(Node).filter( Node.user_id==request.user.id , Node.id==node_id).first()
if corpus==None:
return JsonHttpResponse( {"request" : "forbidden"} )
corpus = session.query(Node).filter( Node.id==node_id).first()
# if corpus==None:
# return JsonHttpResponse( {"request" : "forbidden"} )
start_ = time.time()
ParentNode = aliased(Node)
group_by = []
......@@ -340,7 +340,7 @@ class Group(APIView):
'''
def get_group_id(self , node_id , user_id):
node_id = int(node_id)
corpus = session.query(Node).filter( Node.user_id==user_id , Node.id==node_id).first()
corpus = session.query(Node).filter( Node.id==node_id).first()
if corpus==None: return None
group = get_or_create_node(corpus=corpus, nodetype='Group')
return(group.id)
......
......@@ -75,7 +75,7 @@ def get_ngrams(request , project_id , corpus_id ):
type_doc_id = cache.NodeType['Document'].id
number = session.query(func.count(Node.id)).filter(Node.parent_id==corpus_id, Node.type_id==type_doc_id).all()[0][0]
myamlist_type_id = cache.NodeType['MiamList'].id
miamlist = session.query(Node).filter(Node.user_id == request.user.id , Node.parent_id==corpus_id , Node.type_id == myamlist_type_id ).first()
miamlist = session.query(Node).filter(Node.parent_id==corpus_id , Node.type_id == myamlist_type_id ).first()
the_query = """ SELECT hyperdata FROM node_node WHERE id=%d """ % ( int(corpus_id) )
cursor = connection.cursor()
......@@ -158,7 +158,7 @@ def get_journals_json(request , project_id, corpus_id ):
user_id = request.user.id
document_type_id = cache.NodeType['Document'].id
documents = session.query(Node).filter(Node.user_id == user_id , Node.parent_id==corpus_id , Node.type_id == document_type_id ).all()
documents = session.query(Node).filter( Node.parent_id==corpus_id , Node.type_id == document_type_id ).all()
for doc in documents:
if "journal" in doc.hyperdata:
journal = doc.hyperdata["journal"]
......
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