projects
/
htsworkflow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert stanford/hudson alpha's updStatus to work with django 1.0.2's
[htsworkflow.git]
/
htsworkflow
/
frontend
/
experiments
/
experiments.py
diff --git
a/htsworkflow/frontend/experiments/experiments.py
b/htsworkflow/frontend/experiments/experiments.py
index b8c166ec5661a4ba74f6c28498efd24ef67feaf2..0d17c27411830fb69ae778e23b5d6acc200c0d7d 100755
(executable)
--- a/
htsworkflow/frontend/experiments/experiments.py
+++ b/
htsworkflow/frontend/experiments/experiments.py
@@
-18,30
+18,28
@@
def updStatus(request):
fcid = 'none'
runfolder = 'unknown'
ClIP = request.META['REMOTE_ADDR']
fcid = 'none'
runfolder = 'unknown'
ClIP = request.META['REMOTE_ADDR']
- granted = False
- if request.has_key('user'):
- user = request['user']
-
- #Check access permission
- if (user == 'rami' and settings.ALLOWED_IPS.has_key(ClIP)): granted = True
- if not granted: return HttpResponse("access denied.")
+ if hasattr(request, 'user'):
+ user = request.user
+ #Check access permission
+ if not (user.is_superuser and settings.ALLOWED_IPS.has_key(ClIP)):
+ return HttpResponse("%s access denied from %s." % (user, ClIP))
# ~~~~~~Parameters for the job ~~~~
# ~~~~~~Parameters for the job ~~~~
- if request.has_key('fcid'):
- fcid = request['fcid']
+ if request.
REQUEST.
has_key('fcid'):
+ fcid = request
.REQUEST
['fcid']
else:
return HttpResponse('missing fcid')
else:
return HttpResponse('missing fcid')
- if request.has_key('runf'):
- runfolder = request['runf']
+ if request.
REQUEST.
has_key('runf'):
+ runfolder = request
.REQUEST
['runf']
else:
return HttpResponse('missing runf')
else:
return HttpResponse('missing runf')
- if request.has_key('updst'):
- UpdatedStatus = request['updst']
+ if request.
REQUEST.
has_key('updst'):
+ UpdatedStatus = request
.REQUEST
['updst']
else:
return HttpResponse('missing status')
else:
return HttpResponse('missing status')
@@
-56,7
+54,7
@@
def updStatus(request):
#if there's a message update that too
mytimestamp = datetime.now().__str__()
mytimestamp = re.sub(pattern=":[^:]*$",repl="",string=mytimestamp)
#if there's a message update that too
mytimestamp = datetime.now().__str__()
mytimestamp = re.sub(pattern=":[^:]*$",repl="",string=mytimestamp)
- if request.has_key('msg'):
+ if request.
REQUEST.
has_key('msg'):
rec.run_note += ", "+request['msg']+" ("+mytimestamp+")"
else :
if UpdatedStatus == '1':
rec.run_note += ", "+request['msg']+" ("+mytimestamp+")"
else :
if UpdatedStatus == '1':