projects
/
htsworkflow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
41656ba
)
(no commit message)
author
Rami Rauch
<rrauch@stanford.edu>
Wed, 8 Jul 2009 22:56:55 +0000
(22:56 +0000)
committer
Rami Rauch
<rrauch@stanford.edu>
Wed, 8 Jul 2009 22:56:55 +0000
(22:56 +0000)
htswfrontend/htswfrontend/exp_track/exptrack.py
patch
|
blob
|
history
diff --git
a/htswfrontend/htswfrontend/exp_track/exptrack.py
b/htswfrontend/htswfrontend/exp_track/exptrack.py
index 62e69172d9e2f403c0af98943a40bd46bd664a96..de250aa177fe2692c5d6baccf8e90805382add3c 100755
(executable)
--- a/
htswfrontend/htswfrontend/exp_track/exptrack.py
+++ b/
htswfrontend/htswfrontend/exp_track/exptrack.py
@@
-11,7
+11,6
@@
from django.core.mail import send_mail, mail_admins
def updStatus(request):
output=''
def updStatus(request):
output=''
- user = 'none'
pswd = ''
UpdatedStatus = 'unknown'
fcid = 'none'
pswd = ''
UpdatedStatus = 'unknown'
fcid = 'none'
@@
-19,11
+18,8
@@
def updStatus(request):
ClIP = request.META['REMOTE_ADDR']
granted = False
ClIP = request.META['REMOTE_ADDR']
granted = False
- if request.has_key('user'):
- user = request['user']
-
#Check access permission
#Check access permission
- if (
user == 'rami' and
settings.ALLOWED_IPS.has_key(ClIP)): granted = True
+ if (settings.ALLOWED_IPS.has_key(ClIP)): granted = True
if not granted: return HttpResponse("access denied.")
if not granted: return HttpResponse("access denied.")
@@
-63,7
+59,8
@@
def updStatus(request):
rec.run_start_time = datetime.now()
rec.save()
rec.run_start_time = datetime.now()
rec.save()
- output = "Hello "+settings.ALLOWED_IPS[ClIP]+". Updated to:'"+DataRun.RUN_STATUS_CHOICES[int(UpdatedStatus)][1].__str__()+"'"
+ output = "Hello "+settings.ALLOWED_IPS[ClIP]+". Updated " + runfolder + " status code to "+UpdatedStatus+" ("+DataRun.RUN_STATUS_CHOICES[int(UpdatedStatus)][1].__str__()+")"
+ if request.has_key('msg'): output += " and added message text: '"+request['msg']+" ("+mytimestamp+")'"
except ObjectDoesNotExist:
output = "entry not found: "+fcid+", "+runfolder
except ObjectDoesNotExist:
output = "entry not found: "+fcid+", "+runfolder