From 69570c5126527ebc8955190006086839d085e8c0 Mon Sep 17 00:00:00 2001 From: Michal Kolodziejski Date: Wed, 8 Jul 2015 13:27:17 +0200 Subject: [PATCH] Delete legacy code related to 'Material Package' --- indico/MaKaC/webinterface/meeting.py | 18 ---- indico/MaKaC/webinterface/pages/conferences.py | 57 ---------- indico/MaKaC/webinterface/rh/conferenceDisplay.py | 52 --------- indico/MaKaC/webinterface/rh/conferenceModif.py | 40 ------- indico/MaKaC/webinterface/simple_event.py | 18 ---- .../webinterface/tpls/FullMaterialPackage.tpl | 117 --------------------- indico/MaKaC/webinterface/urlHandlers.py | 16 --- indico/web/flask/blueprints/event/display/misc.py | 5 - .../web/flask/blueprints/event/management/tools.py | 5 - 9 files changed, 328 deletions(-) delete mode 100644 indico/MaKaC/webinterface/tpls/FullMaterialPackage.tpl diff --git a/indico/MaKaC/webinterface/meeting.py b/indico/MaKaC/webinterface/meeting.py index ebbc85ea8..8951017c5 100644 --- a/indico/MaKaC/webinterface/meeting.py +++ b/indico/MaKaC/webinterface/meeting.py @@ -1149,21 +1149,3 @@ class WMTimeTableCustomizePDF(wcomponents.WTemplated): url.addParam("view", self._view) vars["getPDFURL"]=quoteattr(str(url)) return vars - - -######################## Get file package ###################### -class WPMDisplayFullMaterialPackage(WPMeetingDisplay, conferences.WPDisplayFullMaterialPackage): - - def __init__(self, rh, conf): - WPMeetingDisplay.__init__(self, rh, conf) - # An hack to make sure that the background is the same as the header - self._extraCSS.append("body { background: #424242; } ") - - def _getFooter( self ): - wc = wcomponents.WFooter() - p = {"dark":True} - return wc.getHTML(p) - - def _getBody(self, params): - html = """
%s
""" - return html%conferences.WPDisplayFullMaterialPackage._getBody(self, params) diff --git a/indico/MaKaC/webinterface/pages/conferences.py b/indico/MaKaC/webinterface/pages/conferences.py index ac2ae0902..cadbf1591 100644 --- a/indico/MaKaC/webinterface/pages/conferences.py +++ b/indico/MaKaC/webinterface/pages/conferences.py @@ -5102,55 +5102,6 @@ class WPModAbstractBook(WPConferenceModifAbstractBase): for url in self._asset_env['mathjax_js'].urls()]) -class WPFullMaterialPackage(WPConfModifToolsBase): - - def _setActiveTab(self): - self._tabMatPackage.setActive() - - def _getTabContent(self, params): - wc = WFullMaterialPackage(self._conf) - return wc.getHTML() - - -class WFullMaterialPackage(wcomponents.WTemplated): - - def __init__(self,conf): - self._conf=conf - - def getVars(self): - vars=wcomponents.WTemplated.getVars(self) - if not vars.has_key("getPkgURL"): - vars["getPkgURL"] = quoteattr(str(urlHandlers.UHConfModFullMaterialPackagePerform.getURL(self._conf))) - - ####################################### - # Fermi timezone awareness # - ####################################### - sDate = self._conf.getSchedule().getAdjustedStartDate() - eDate = self._conf.getSchedule().getAdjustedEndDate() - ####################################### - # Fermi timezone awareness(end) # - ####################################### - vars["selectAll"] = Config.getInstance().getSystemIconURL("checkAll") - vars["deselectAll"] = Config.getInstance().getSystemIconURL("uncheckAll") - htmlDay = [] - while sDate <= eDate: - htmlDay.append(""" - - %s - - """%(format_date(sDate, format='dMMMMyyyy'), format_date(sDate, format='long') ) ) - sDate += timedelta(days=1) - vars["dayList"] = "".join(htmlDay) - vars["sessionList"] = "" - if len(self._conf.getSessionList()) == 0: - vars["sessionList"] = "No session in this event" - for session in self._conf.getSessionList(): - vars["sessionList"] += i18nformat(""" - %s _("(last modified: %s)")
""") % (session.getId(),session.getTitle(), format_datetime(session.getModificationDate(), format='d MMMM yyyy H:mm')) - - vars["materialTypes"] = MaterialFactoryRegistry.getAllowed(self._conf) - return vars - # ------------------ Static web pages ------------------ class WPConferenceStaticDefaultDisplayBase( WPConferenceDefaultDisplayBase ): @@ -7153,14 +7104,6 @@ class WPConfModifRelocate(WPConferenceModifBase): return wc.getHTML(p) -class WPDisplayFullMaterialPackage(WPConferenceDefaultDisplayBase): - - def _getBody(self, params): - wc = WFullMaterialPackage(self._conf) - p = {"getPkgURL": urlHandlers.UHConferenceDisplayMaterialPackagePerform.getURL(self._conf)} - return wc.getHTML(p) - - # ============================================================================ # === Badges related ========================================================= # ============================================================================ diff --git a/indico/MaKaC/webinterface/rh/conferenceDisplay.py b/indico/MaKaC/webinterface/rh/conferenceDisplay.py index d0489025f..613d82154 100644 --- a/indico/MaKaC/webinterface/rh/conferenceDisplay.py +++ b/indico/MaKaC/webinterface/rh/conferenceDisplay.py @@ -849,55 +849,3 @@ class RHConferenceLatexPackage(RHConferenceBaseDisplay): zipdata.seek(0) return send_file(filename, zipdata, 'ZIP', inline=False) - - -class RHFullMaterialPackage(RHConferenceBaseDisplay): - _uh=urlHandlers.UHConferenceDisplayMaterialPackage - - def _checkParams( self, params ): - RHConferenceBaseDisplay._checkParams( self, params ) - - def _process( self ): - - wf = self.getWebFactory() - if wf!=None : #Event == Meeting/Lecture - p = wf.getDisplayFullMaterialPackage(self,self._target) - else : #Event == Conference - p = conferences.WPDisplayFullMaterialPackage(self,self._target) - return p.display() - - -class RHFullMaterialPackagePerform(RHConferenceBaseDisplay): - _uh = urlHandlers.UHConferenceDisplayMaterialPackagePerform - - def _checkParams(self, params): - RHConferenceBaseDisplay._checkParams(self, params) - self._days = self._normaliseListParam(params.get("days", [])) - self._mainResource = (params.get("mainResource", "") != "") - self._fromDate = "" - fromDay = params.get("fromDay", "") - fromMonth = params.get("fromMonth", "") - fromYear = params.get("fromYear", "") - if fromDay != "" and fromMonth != "" and fromYear != "" and \ - fromDay != "dd" and fromMonth != "mm" and fromYear != "yyyy": - self._fromDate = "%s %s %s" % (fromDay, fromMonth, fromYear) - self._cancel = "cancel" in params - self._materialTypes = self._normaliseListParam( - params.get("materialType", [])) - self._sessionList = self._normaliseListParam( - params.get("sessionList", [])) - - def _process(self): - if not self._cancel: - if self._materialTypes != []: - p = ConferencePacker(self._conf, self._aw) - path = p.pack(self._materialTypes, self._days, self._mainResource, self._fromDate, ZIPFileHandler(), self._sessionList) - if not p.getItems(): - raise NoReportError(_("The selected package does not contain any items.")) - return send_file('full-material.zip', path, 'ZIP', inline=False) - else: - raise NoReportError( - _("You have to select at least one material type")) - else: - self._redirect( - urlHandlers.UHConferenceDisplay.getURL(self._conf)) diff --git a/indico/MaKaC/webinterface/rh/conferenceModif.py b/indico/MaKaC/webinterface/rh/conferenceModif.py index 8bedf50f7..961d6f8b9 100644 --- a/indico/MaKaC/webinterface/rh/conferenceModif.py +++ b/indico/MaKaC/webinterface/rh/conferenceModif.py @@ -3153,46 +3153,6 @@ class RHAbstractBookToogleShowIds( RHConfModifCFABase ): self._conf.getBOAConfig().setShowIds(not self._conf.getBOAConfig().getShowIds()) self._redirect( urlHandlers.UHConfModAbstractBook.getURL( self._conf ) ) -class RHFullMaterialPackage(RHConferenceModifBase): - _uh=urlHandlers.UHConfModFullMaterialPackage - - def _checkParams( self, params ): - RHConferenceModifBase._checkParams( self, params ) - - def _process( self ): - p = conferences.WPFullMaterialPackage(self,self._target) - return p.display() - - -class RHFullMaterialPackagePerform(RHConferenceModifBase): - _uh=urlHandlers.UHConfModFullMaterialPackagePerform - - def _checkParams( self, params ): - RHConferenceModifBase._checkParams( self, params ) - self._days=self._normaliseListParam(params.get("days",[])) - self._mainResource = (params.get("mainResource","") != "") - self._fromDate = "" - fromDay = params.get("fromDay","") - fromMonth = params.get("fromMonth","") - fromYear = params.get("fromYear","") - if fromDay != "" and fromMonth != "" and fromYear != "" and \ - fromDay != "dd" and fromMonth != "mm" and fromYear != "yyyy": - self._fromDate = "%s %s %s"%(fromDay, fromMonth, fromYear) - self._cancel = params.has_key("cancel") - self._materialTypes=self._normaliseListParam(params.get("materialType",[])) - self._sessionList = self._normaliseListParam(params.get("sessionList",[])) - - def _process( self ): - if not self._cancel: - if self._materialTypes: - p=ConferencePacker(self._conf, self._aw) - path=p.pack(self._materialTypes, self._days, self._mainResource, self._fromDate, ZIPFileHandler(),self._sessionList) - if not p.getItems(): - raise NoReportError(_("The selected package does not contain any items.")) - return send_file('full-material.zip', path, 'ZIP', inline=False) - raise NoReportError(_("You have to select at least one material type")) - else: - self._redirect( urlHandlers.UHConfModifTools.getURL( self._conf ) ) class RHModifSessionCoordRights( RHConferenceModifBase ): _uh = urlHandlers.UHConfPerformDataModif diff --git a/indico/MaKaC/webinterface/simple_event.py b/indico/MaKaC/webinterface/simple_event.py index 07b713407..5c3940e45 100644 --- a/indico/MaKaC/webinterface/simple_event.py +++ b/indico/MaKaC/webinterface/simple_event.py @@ -487,21 +487,3 @@ class WPSEEvaluationInactive (WPSEEvaluationBase, evaluations.WPEvaluationInacti def _getBody(self, params): return evaluations.WPEvaluationInactive._getBody(self, params) - - -######################## Get file package ###################### -class WPSEDisplayFullMaterialPackage(WPSimpleEventDisplay, conferences.WPDisplayFullMaterialPackage): - - def __init__(self, rh, conf): - WPSimpleEventDisplay.__init__(self, rh, conf) - # An hack to make sure that the background is the same as the header - self._extraCSS.append("body { background: #424242; } ") - - def _getFooter( self ): - wc = wcomponents.WFooter() - p = {"dark":True} - return wc.getHTML(p) - - def _getBody(self, params): - html = """
%s
""" - return html%conferences.WPDisplayFullMaterialPackage._getBody(self, params) diff --git a/indico/MaKaC/webinterface/tpls/FullMaterialPackage.tpl b/indico/MaKaC/webinterface/tpls/FullMaterialPackage.tpl deleted file mode 100644 index 3bbfeb7d5..000000000 --- a/indico/MaKaC/webinterface/tpls/FullMaterialPackage.tpl +++ /dev/null @@ -1,117 +0,0 @@ - - -

${ _("Get file package")}

-
- - - - - - - - - - - - - % if self_._conf.getType() == "conference": - - - - - - - - % endif - - - - - - - - - - -
${ _("Contributions scheduled on")}:
- - ${ dayList } -
-
 
- - - - - -
- - - - - - - -
${ _("Material type")}
- % for materialTypeName in materialTypes: -
- ${_(materialTypeName.capitalize())} -
- % endfor - ${_("Other types")} -
- 		- - - - - - - -
${ _("Sessions")}
- ${ _( - ${ _( 
- ${ sessionList } -
-
-
 
${ _("Main Resource")}
- ${ _("Get only main resources from each material")} -
 
${ _("Get material")}...
- - - - -
- ${ _("get only files added since")} - - - - - -
-
 
- -
-
-
diff --git a/indico/MaKaC/webinterface/urlHandlers.py b/indico/MaKaC/webinterface/urlHandlers.py index 0ce758219..6f8795e94 100644 --- a/indico/MaKaC/webinterface/urlHandlers.py +++ b/indico/MaKaC/webinterface/urlHandlers.py @@ -1752,14 +1752,6 @@ class UHConfModMoveContribsToSession(URLHandler): _endpoint = 'event_mgmt.confModifContribList-moveToSession' -class UHConferenceDisplayMaterialPackage(URLHandler): - _endpoint = 'event.conferenceDisplay-matPkg' - - -class UHConferenceDisplayMaterialPackagePerform(URLHandler): - _endpoint = 'event.conferenceDisplay-performMatPkg' - - class UHConfAbstractBook(URLHandler): _endpoint = 'event.conferenceDisplay-abstractBook' @@ -1804,14 +1796,6 @@ class UHConfModProceedings(URLHandler): _endpoint = 'event_mgmt.confModifContribList-proceedings' -class UHConfModFullMaterialPackage(URLHandler): - _endpoint = 'event_mgmt.confModifTools-matPkg' - - -class UHConfModFullMaterialPackagePerform(URLHandler): - _endpoint = 'event_mgmt.confModifTools-performMatPkg' - - class UHUpdateNews(URLHandler): _endpoint = 'admin.updateNews' diff --git a/indico/web/flask/blueprints/event/display/misc.py b/indico/web/flask/blueprints/event/display/misc.py index ef36f8b11..75a5acb67 100644 --- a/indico/web/flask/blueprints/event/display/misc.py +++ b/indico/web/flask/blueprints/event/display/misc.py @@ -18,11 +18,6 @@ from MaKaC.webinterface.rh import conferenceDisplay from indico.web.flask.blueprints.event.display import event -# Material package -event.add_url_rule('/material/download', 'conferenceDisplay-matPkg', conferenceDisplay.RHFullMaterialPackage) -event.add_url_rule('/material/download', 'conferenceDisplay-performMatPkg', - conferenceDisplay.RHFullMaterialPackagePerform, methods=('POST',)) - # My conference event.add_url_rule('/my-conference/', 'myconference', conferenceDisplay.RHMyStuff) event.add_url_rule('/my-conference/contributions', 'myconference-myContributions', diff --git a/indico/web/flask/blueprints/event/management/tools.py b/indico/web/flask/blueprints/event/management/tools.py index 394c252d0..d154ce577 100644 --- a/indico/web/flask/blueprints/event/management/tools.py +++ b/indico/web/flask/blueprints/event/management/tools.py @@ -60,8 +60,3 @@ event_mgmt.add_url_rule('/tools/badges/background', 'confModifTools-badgeGetBack conferenceModif.RHConfBadgeGetBackground, methods=('GET', 'POST')) event_mgmt.add_url_rule('/tools/badges/save-background', 'confModifTools-badgeSaveBackground', conferenceModif.RHConfBadgeSaveTempBackground, methods=('POST',)) - -# Tools: Material Package -event_mgmt.add_url_rule('/tools/material-package', 'confModifTools-matPkg', conferenceModif.RHFullMaterialPackage) -event_mgmt.add_url_rule('/tools/material-package', 'confModifTools-performMatPkg', - conferenceModif.RHFullMaterialPackagePerform, methods=('POST',)) -- 2.11.4.GIT