* renamed files and symlinks modules/websubmit/web/publiline.py => modules/websubmit/lib/websubmit_publiline.py * modified files --- orig/modules/webstyle/lib/webinterface_layout.py +++ mod/modules/webstyle/lib/webinterface_layout.py @@ -29,7 +29,7 @@ from invenio.webinterface_handler import create_handler, WebInterfaceDirectory from invenio.websearch_webinterface import WebInterfaceSearchInterfacePages -from invenio.websubmit_webinterface import websubmit_legacy_getfile, WebInterfaceSubmitPages +from invenio.websubmit_webinterface import websubmit_legacy_getfile, WebInterfaceSubmitPages, WebInterfacePublilinePages from invenio.websession_webinterface import WebInterfaceYourAccountPages from invenio.webalert_webinterface import WebInterfaceYourAlertsPages from invenio.webbasket_webinterface import WebInterfaceYourBasketsPages @@ -61,6 +61,7 @@ 'error', 'oai2d', ('oai2d.py', 'oai2d'), ('getfile.py', 'getfile'), + 'publiline', 'submit', @@ -73,6 +74,8 @@ return submit = WebInterfaceSubmitPages() + + publiline = WebInterfacePublilinePages() youraccount = WebInterfaceYourAccountPages() --- orig/modules/websubmit/lib/Makefile.am +++ mod/modules/websubmit/lib/Makefile.am @@ -22,14 +22,15 @@ pylibdir = $(libdir)/python/invenio pylib_DATA = \ - websubmit_config.py \ - websubmit_engine.py file.py \ - websubmit_webinterface.py \ + websubmit_config.py \ + websubmit_engine.py file.py \ + websubmit_webinterface.py \ websubmit_templates.py \ websubmitadmin_config.py \ websubmitadmin_dblayer.py \ websubmitadmin_engine.py \ - websubmitadmin_templates.py + websubmitadmin_templates.py \ + websubmit_publiline.py EXTRA_DIST = $(pylib_DATA) --- orig/modules/websubmit/web/publiline.py +++ mod/modules/websubmit/lib/websubmit_publiline.py @@ -43,42 +43,6 @@ import invenio.template websubmit_templates = invenio.template.load('websubmit') -def index(req,c=cdsname,ln=cdslang,doctype="",categ="",RN="",send=""): - global uid - ln = wash_language(ln) - - # load the right message language - _ = gettext_set_language(ln) - - t="" - # get user ID: - try: - uid = getUid(req) - if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1: - return page_not_authorized(req, "../publiline.py/index") - uid_email = get_email(uid) - except Error, e: - return errorMsg(e.value,req, ln = ln) - if doctype == "": - t = selectDoctype(ln) - elif categ == "": - t = selectCateg(doctype, ln) - elif RN == "": - t = selectDocument(doctype,categ, ln) - else: - t = displayDocument(doctype,categ,RN,send, ln) - return page(title="publication line", - navtrail= """%(account)s""" % { - 'sweburl' : sweburl, - 'account' : _("Your Account"), - }, - body=t, - description="", - keywords="", - uid=uid, - language=ln, - req=req) - def selectDoctype(ln = cdslang): res = run_sql("select DISTINCT doctype from sbmAPPROVAL") docs = [] @@ -223,7 +187,7 @@ result = getInAlice(doctype,categ,RN) return result -#seek info in pending directory +#seek info in pending directory def getInPending(doctype,categ,RN): PENDIR="%s/pending" % storage if os.path.exists("%s/%s/%s/AU" % (PENDIR,doctype,RN)): --- orig/modules/websubmit/lib/websubmit_webinterface.py +++ mod/modules/websubmit/lib/websubmit_webinterface.py @@ -33,6 +33,7 @@ from invenio.webpage import page, create_error_box from invenio.webuser import getUid, get_email, page_not_authorized from invenio.websubmit_config import * +from invenio.websubmit_publiline import * from invenio.file import * from invenio.access_control_config import CFG_ACCESS_CONTROL_LEVEL_SITE from invenio.webinterface_handler import wash_urlargd, WebInterfaceDirectory @@ -176,6 +177,49 @@ return True, '' +class WebInterfacePublilinePages(WebInterfaceDirectory): + + # Only the index function is public + _exports = [''] + + # default Method + def index(self, req, c=cdsname, ln=cdslang, doctype="", categ="", RN="", send=""): + global uid + ln = wash_language(ln) + + # load the right message language + _ = gettext_set_language(ln) + + t="" + # get user ID: + try: + uid = getUid(req) + if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1: + return page_not_authorized(req, "../publiline.py/index") + uid_email = get_email(uid) + except Error, e: + return errorMsg(e.value,req, ln = ln) + if doctype == "": + t = selectDoctype(ln) + elif categ == "": + t = selectCateg(doctype, ln) + elif RN == "": + t = selectDocument(doctype,categ, ln) + else: + t = displayDocument(doctype,categ,RN,send, ln) + return page(title="publication line", + navtrail= """%(account)s""" % { + 'sweburl' : sweburl, + 'account' : _("Your Account"), + }, + body=t, + description="", + keywords="", + uid=uid, + language=ln, + req=req) + + class WebInterfaceFilesPages(WebInterfaceDirectory): def __init__(self,recid): * modified files --- orig/modules/websubmit/web/Makefile.am +++ mod/modules/websubmit/web/Makefile.am @@ -22,7 +22,6 @@ docdir = $(localstatedir)/www doc_DATA = approve.py \ - publiline.py \ yourapprovals.py \ yoursubmissions.py * modified files --- orig/modules/websubmit/lib/websubmit_webinterface.py +++ mod/modules/websubmit/lib/websubmit_webinterface.py @@ -183,9 +183,15 @@ _exports = [''] # default Method - def index(self, req, c=cdsname, ln=cdslang, doctype="", categ="", RN="", send=""): - global uid - ln = wash_language(ln) + def index(self, req, form): + + # Sanitize args + args = wash_urlargd(form, {'doctype': (str, ''), 'categ': (str, ''), 'RN': (str, ''), 'send': (str, '')}) + ln = args['ln'] + doctype = args['doctype'] + categ = args['categ'] + RN = args['RN'] + send = args['send'] # load the right message language _ = gettext_set_language(ln) * renamed files and symlinks modules/websubmit/web/yoursubmissions.py => modules/websubmit/lib/websubmit_yoursubmissions.py * modified files --- orig/modules/websession/lib/websession_templates.py +++ mod/modules/websession/lib/websession_templates.py @@ -418,7 +418,7 @@ out += self.tmpl_account_template(_("Your Submissions"), _("You can consult the list of %(your_submissions)s and inquire about their status.") % { 'your_submissions' : - """%(your_sub)s""" % { + """%(your_sub)s""" % { 'ln' : ln, 'weburl' : weburl, 'your_sub' : _("your submissions") @@ -791,7 +791,7 @@ 'baskets' : _("baskets"), } if submitter: - out += """%(submission)s :: """ % { + out += """%(submission)s :: """ % { 'weburl' : weburl, 'ln' : ln, 'submission' : _("submissions"), --- orig/modules/webstyle/lib/webinterface_layout.py +++ mod/modules/webstyle/lib/webinterface_layout.py @@ -29,7 +29,10 @@ from invenio.webinterface_handler import create_handler, WebInterfaceDirectory from invenio.websearch_webinterface import WebInterfaceSearchInterfacePages -from invenio.websubmit_webinterface import websubmit_legacy_getfile, WebInterfaceSubmitPages, WebInterfacePublilinePages +from invenio.websubmit_webinterface import websubmit_legacy_getfile +from invenio.websubmit_webinterface import WebInterfaceSubmitPages +from invenio.websubmit_webinterface import WebInterfacePublilinePages +from invenio.websubmit_webinterface import WebInterfaceYourSubmissionsPages from invenio.websession_webinterface import WebInterfaceYourAccountPages from invenio.webalert_webinterface import WebInterfaceYourAlertsPages from invenio.webbasket_webinterface import WebInterfaceYourBasketsPages @@ -62,6 +65,7 @@ 'oai2d', ('oai2d.py', 'oai2d'), ('getfile.py', 'getfile'), 'publiline', + 'yoursubmissions', 'submit', @@ -76,6 +80,8 @@ submit = WebInterfaceSubmitPages() publiline = WebInterfacePublilinePages() + + yoursubmissions = WebInterfaceYourSubmissionsPages() youraccount = WebInterfaceYourAccountPages() --- orig/modules/websubmit/lib/Makefile.am +++ mod/modules/websubmit/lib/Makefile.am @@ -31,7 +31,8 @@ websubmitadmin_dblayer.py \ websubmitadmin_engine.py \ websubmitadmin_templates.py \ - websubmit_publiline.py + websubmit_publiline.py \ + websubmit_yoursubmissions.py EXTRA_DIST = $(pylib_DATA) --- orig/modules/websubmit/lib/websubmit_webinterface.py +++ mod/modules/websubmit/lib/websubmit_webinterface.py @@ -34,6 +34,7 @@ from invenio.webuser import getUid, get_email, page_not_authorized from invenio.websubmit_config import * from invenio.websubmit_publiline import * +from invenio.websubmit_yoursubmissions import * from invenio.file import * from invenio.access_control_config import CFG_ACCESS_CONTROL_LEVEL_SITE from invenio.webinterface_handler import wash_urlargd, WebInterfaceDirectory @@ -177,6 +178,152 @@ return True, '' +class WebInterfaceYourSubmissionsPages(WebInterfaceDirectory): + + # Only the index function is public + _exports = [''] + + def index(self, req, form): + + # Sanitize args + args = wash_urlargd(form, {'order': (str, ''), 'doctype': (str, ''), 'deletedId': (str, ''), 'deletedAction': (str, ''), 'deletedDoctype': (str, '')}) + ln = args['ln'] + order = args['order'] + doctype = args['doctype'] + deletedId = args['deletedId'] + deletedAction = args['deletedAction'] + deletedDoctype = args['deletedDoctype'] + + # load the right message language + _ = gettext_set_language(ln) + + t="" + # get user ID: + try: + uid = getUid(req) + if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1: + return page_not_authorized(req, "../yoursubmissions.py/index") + u_email = get_email(uid) + except Error, e: + return errorMsg(e.value, req, ln) + + if u_email == "guest" or u_email == "": + return warningMsg(websubmit_templates.tmpl_warning_message( + ln = ln, + msg = _("You first have to login before using this feature. Use the left menu to log in."), + ),req, ln = ln) + + + if deletedId != "": + t += deleteSubmission(deletedId,deletedAction,deletedDoctype,u_email) + + # doctypes + res = run_sql("select ldocname,sdocname from sbmDOCTYPE order by ldocname") + doctypes = [] + for row in res: + doctypes.append({ + 'id' : row[1], + 'name' : row[0], + 'selected' : (doctype == row[1]), + }) + + # submissions + # request order default value + reqorder = "sbmSUBMISSIONS.md DESC, lactname" + # requested value + if order == "actiondown": + reqorder = "lactname ASC, sbmSUBMISSIONS.md DESC" + elif order == "actionup": + reqorder = "lactname DESC, sbmSUBMISSIONS.md DESC" + elif order == "refdown": + reqorder = "reference ASC, sbmSUBMISSIONS.md DESC, lactname DESC" + elif order == "refup": + reqorder = "reference DESC, sbmSUBMISSIONS.md DESC, lactname DESC" + elif order == "cddown": + reqorder = "sbmSUBMISSIONS.cd DESC, lactname" + elif order == "cdup": + reqorder = "sbmSUBMISSIONS.cd ASC, lactname" + elif order == "mddown": + reqorder = "sbmSUBMISSIONS.md DESC, lactname" + elif order == "mdup": + reqorder = "sbmSUBMISSIONS.md ASC, lactname" + elif order == "statusdown": + reqorder = "sbmSUBMISSIONS.status DESC, lactname" + elif order == "statusup": + reqorder = "sbmSUBMISSIONS.status ASC, lactname" + if doctype != "": + docselect = " and doctype='%s' " % doctype + else: + docselect = "" + + res = run_sql("SELECT sbmSUBMISSIONS.* FROM sbmSUBMISSIONS,sbmACTION WHERE sactname=action and email=%s and id!='' "+docselect+" ORDER BY doctype,"+reqorder,(u_email,)) + currentdoctype = "" + currentaction = "" + currentstatus = "" + + submissions = [] + for row in res: + if currentdoctype != row[1]: + currentdoctype = row[1] + currentaction = "" + currentstatus = "" + res2 = run_sql("SELECT ldocname FROM sbmDOCTYPE WHERE sdocname=%s",(currentdoctype,)) + if res2: + ldocname = res2[0][0] + else: + ldocname = """***Unknown Document Type - (%s)""" % (currentdoctype,) + + if currentaction != row[2]: + currentaction = row[2] + res2 = run_sql("SELECT lactname FROM sbmACTION WHERE sactname=%s",(currentaction,)) + if res2: + lactname = res2[0][0] + else: + lactname = "\"" + else: + lactname = "\"" + + if currentstatus != row[3]: + currentstatus = row[3] + status=row[3] + else: + status = "\"" + + submissions.append({ + 'docname' : ldocname, + 'actname' : lactname, + 'status' : status, + 'cdate' : row[6], + 'mdate' : row[7], + 'reference' : row[5], + 'id' : row[4], + 'act' : currentaction, + 'doctype' : currentdoctype, + 'pending' : (row[3] == "pending") + }) + # display + t += websubmit_templates.tmpl_yoursubmissions( + ln = ln, + weburl = weburl, + images = images, + order = order, + doctypes = doctypes, + submissions = submissions, + ) + + return page(title="Your Submissions", + navtrail= """%(account)s""" % { + 'sweburl' : sweburl, + 'account' : _("Your Account"), + }, + body=t, + description="", + keywords="", + uid=uid, + language=ln, + req=req) + + class WebInterfacePublilinePages(WebInterfaceDirectory): # Only the index function is public --- orig/modules/websubmit/web/yoursubmissions.py +++ mod/modules/websubmit/lib/websubmit_yoursubmissions.py @@ -41,138 +41,6 @@ import invenio.template websubmit_templates = invenio.template.load('websubmit') -def index(req,c=cdsname,ln=cdslang,order="",doctype="",deletedId="",deletedAction="",deletedDoctype=""): - global uid - ln = wash_language(ln) - - # load the right message language - _ = gettext_set_language(ln) - - t="" - # get user ID: - try: - uid = getUid(req) - if uid == -1 or CFG_ACCESS_CONTROL_LEVEL_SITE >= 1: - return page_not_authorized(req, "../yoursubmissions.py/index") - u_email = get_email(uid) - except Error, e: - return errorMsg(e.value, req, ln) - - if u_email == "guest" or u_email == "": - return warningMsg(websubmit_templates.tmpl_warning_message( - ln = ln, - msg = _("You first have to login before using this feature. Use the left menu to log in."), - ),req, ln = ln) - - - if deletedId != "": - t += deleteSubmission(deletedId,deletedAction,deletedDoctype,u_email) - - # doctypes - res = run_sql("select ldocname,sdocname from sbmDOCTYPE order by ldocname") - doctypes = [] - for row in res: - doctypes.append({ - 'id' : row[1], - 'name' : row[0], - 'selected' : (doctype == row[1]), - }) - - # submissions - # request order default value - reqorder = "sbmSUBMISSIONS.md DESC, lactname" - # requested value - if order == "actiondown": - reqorder = "lactname ASC, sbmSUBMISSIONS.md DESC" - elif order == "actionup": - reqorder = "lactname DESC, sbmSUBMISSIONS.md DESC" - elif order == "refdown": - reqorder = "reference ASC, sbmSUBMISSIONS.md DESC, lactname DESC" - elif order == "refup": - reqorder = "reference DESC, sbmSUBMISSIONS.md DESC, lactname DESC" - elif order == "cddown": - reqorder = "sbmSUBMISSIONS.cd DESC, lactname" - elif order == "cdup": - reqorder = "sbmSUBMISSIONS.cd ASC, lactname" - elif order == "mddown": - reqorder = "sbmSUBMISSIONS.md DESC, lactname" - elif order == "mdup": - reqorder = "sbmSUBMISSIONS.md ASC, lactname" - elif order == "statusdown": - reqorder = "sbmSUBMISSIONS.status DESC, lactname" - elif order == "statusup": - reqorder = "sbmSUBMISSIONS.status ASC, lactname" - if doctype != "": - docselect = " and doctype='%s' " % doctype - else: - docselect = "" - - res = run_sql("SELECT sbmSUBMISSIONS.* FROM sbmSUBMISSIONS,sbmACTION WHERE sactname=action and email=%s and id!='' "+docselect+" ORDER BY doctype,"+reqorder,(u_email,)) - currentdoctype = "" - currentaction = "" - currentstatus = "" - - submissions = [] - for row in res: - if currentdoctype != row[1]: - currentdoctype = row[1] - currentaction = "" - currentstatus = "" - res2 = run_sql("SELECT ldocname FROM sbmDOCTYPE WHERE sdocname=%s",(currentdoctype,)) - if res2: - ldocname = res2[0][0] - else: - ldocname = """***Unknown Document Type - (%s)""" % (currentdoctype,) - - if currentaction != row[2]: - currentaction = row[2] - res2 = run_sql("SELECT lactname FROM sbmACTION WHERE sactname=%s",(currentaction,)) - if res2: - lactname = res2[0][0] - else: - lactname = "\"" - else: - lactname = "\"" - - if currentstatus != row[3]: - currentstatus = row[3] - status=row[3] - else: - status = "\"" - - submissions.append({ - 'docname' : ldocname, - 'actname' : lactname, - 'status' : status, - 'cdate' : row[6], - 'mdate' : row[7], - 'reference' : row[5], - 'id' : row[4], - 'act' : currentaction, - 'doctype' : currentdoctype, - 'pending' : (row[3] == "pending") - }) - # display - t += websubmit_templates.tmpl_yoursubmissions( - ln = ln, - weburl = weburl, - images = images, - order = order, - doctypes = doctypes, - submissions = submissions, - ) - - return page(title="Your Submissions", - navtrail= """%(account)s""" % { - 'sweburl' : sweburl, - 'account' : _("Your Account"), - }, - body=t, - description="", - keywords="", - uid=uid, - language=ln, - req=req) def deleteSubmission(id, action, doctype, u_email): global storage --- orig/modules/websubmit/web/Makefile.am +++ mod/modules/websubmit/web/Makefile.am @@ -22,8 +22,7 @@ docdir = $(localstatedir)/www doc_DATA = approve.py \ - yourapprovals.py \ - yoursubmissions.py + yourapprovals.py EXTRA_DIST = $(doc_DATA) * renamed files and symlinks modules/websubmit/web/yourapprovals.py => modules/websubmit/lib/websubmit_yourapprovals.py * modified files --- orig/modules/websession/lib/websession_templates.py +++ mod/modules/websession/lib/websession_templates.py @@ -427,7 +427,7 @@ out += self.tmpl_account_template(_("Your Approvals"), _("You can consult the list of %(your_approvals)s with the documents you approved or refereed.") % { 'your_approvals' : - """ %(your_app)s""" % { + """ %(your_app)s""" % { 'ln' : ln, 'weburl' : weburl, 'your_app' : _("your approvals"), @@ -797,7 +797,7 @@ 'submission' : _("submissions"), } if referee: - out += """%(approvals)s :: """ % { + out += """%(approvals)s :: """ % { 'weburl' : weburl, 'ln' : ln, 'approvals' : _("approvals"), --- orig/modules/webstyle/lib/webinterface_layout.py +++ mod/modules/webstyle/lib/webinterface_layout.py @@ -33,6 +33,7 @@ from invenio.websubmit_webinterface import WebInterfaceSubmitPages from invenio.websubmit_webinterface import WebInterfacePublilinePages from invenio.websubmit_webinterface import WebInterfaceYourSubmissionsPages +from invenio.websubmit_webinterface import WebInterfaceYourApprovalsPages from invenio.websession_webinterface import WebInterfaceYourAccountPages from invenio.webalert_webinterface import WebInterfaceYourAlertsPages from invenio.webbasket_webinterface import WebInterfaceYourBasketsPages @@ -66,6 +67,7 @@ ('getfile.py', 'getfile'), 'publiline', 'yoursubmissions', + 'yourapprovals', 'submit', @@ -82,6 +84,8 @@ publiline = WebInterfacePublilinePages() yoursubmissions = WebInterfaceYourSubmissionsPages() + + yourapprovals = WebInterfaceYourApprovalsPages() youraccount = WebInterfaceYourAccountPages() --- orig/modules/websubmit/doc/approval.html.wml +++ mod/modules/websubmit/doc/approval.html.wml @@ -28,7 +28,7 @@ the document server. The request is usually sent to you through an email. Once you have made your decision, you will also receive a confirmation email.

The document should appear on the - Documents Status list and on your personal + Documents Status list and on your personal approvals page. There you will be able to send a new request if you lost the first one. --- orig/modules/websubmit/lib/Makefile.am +++ mod/modules/websubmit/lib/Makefile.am @@ -32,7 +32,8 @@ websubmitadmin_engine.py \ websubmitadmin_templates.py \ websubmit_publiline.py \ - websubmit_yoursubmissions.py + websubmit_yoursubmissions.py \ + websubmit_yourapprovals.py EXTRA_DIST = $(pylib_DATA) --- orig/modules/websubmit/lib/websubmit_templates.py +++ mod/modules/websubmit/lib/websubmit_templates.py @@ -1506,14 +1506,14 @@ out += """