Changeset 3a480c6863bced8a371cf98dc08c61d536b1225b in indico

Timestamp:

02/01/12 18:02:46 (4 months ago)

Author:

Alberto Resco Perez <alberto.resco.perez@…>

Children:

007494c29b38a4e4c0224109cf058e6841a9bf24

Parents:

3c3d13056f085b142f851977dae17051b8e5f2db

git-author:

Alberto Resco Perez <alberto.resco.perez@…> (02/01/12 18:02:46)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (02/02/12 14:49:16)

Message:

[IMP] Show abstracts files in contribution list

• Added new option in Call for abstracts setup.
• Included in contribution list display and contribution display.
• When getting the file do now check protection if the option is active.
• Closes #981.

Location:

indico

Files:

• MaKaC/review.py (modified) (2 diffs)
• MaKaC/webinterface/pages/conferences.py (modified) (7 diffs)
• MaKaC/webinterface/pages/contributions.py (modified) (2 diffs)
• MaKaC/webinterface/rh/CFADisplay.py (modified) (1 diff)
• MaKaC/webinterface/rh/conferenceModif.py (modified) (1 diff)
• MaKaC/webinterface/tpls/ConfContributionList.tpl (modified) (1 diff)
• MaKaC/webinterface/tpls/ConfModifCFA.tpl (modified) (2 diffs)
• MaKaC/webinterface/tpls/ContributionDisplayFull.tpl (modified) (1 diff)
• MaKaC/webinterface/tpls/ContributionDisplayMin.tpl (modified) (1 diff)
• MaKaC/webinterface/urlHandlers.py (modified) (1 diff)
• htdocs/confModifCFA.py (modified) (1 diff)

indico/MaKaC/review.py

@@ -701 +701 @@
         self._showSelectAsSpeaker= True
         self._selectSpeakerMandatory= True
+        self._showAttachedFilesContribList = False
 
     def getMultipleTracks( self ):
@@ -751 +752 @@
     def setSelectSpeakerMandatory(self, selectSpeakerMandatory):
         self._selectSpeakerMandatory = selectSpeakerMandatory
+
+    def showAttachedFilesContribList(self):
+        try:
+            return self._showAttachedFilesContribList
+        except:
+            self._showAttachedFilesContribList= False
+            return self._showAttachedFilesContribList
+
+    def setSwitchShowAttachedFilesContribList(self, showshowAttachedFilesContribList):
+        self._showAttachedFilesContribList = showshowAttachedFilesContribList
 
     def getAbstractFieldsMgr(self):

indico/MaKaC/webinterface/pages/conferences.py

@@ -4689 +4689 @@
         vars["showSelectAsSpeaker"] = abMgr.showSelectAsSpeaker()
         vars["isSelectSpeakerMandatory"] = abMgr.isSelectSpeakerMandatory()
+        vars["showAttachedFilesContribList"] = abMgr.showAttachedFilesContribList()
 
         vars["multipleUrl"] = urlHandlers.UHConfCFASwitchMultipleTracks.getURL(self._conf)
@@ -4695 +4696 @@
         vars["showSpeakerUrl"] = urlHandlers.UHConfCFAShowSelectAsSpeaker.getURL(self._conf)
         vars["speakerMandatoryUrl"] = urlHandlers.UHConfCFASelectSpeakerMandatory.getURL(self._conf)
+        vars["showAttachedFilesUrl"] = urlHandlers.UHConfCFAAttachedFilesContribList.getURL(self._conf)
 
         vars["setStatusURL"]=urlHandlers.UHConfCFAChangeStatus.getURL(self._conf)
@@ -7518 +7520 @@
                 mat.append("<a href=%s>%s</a>" % ( quoteattr(str(url)),self._getMaterialIcon(Config.getInstance().getSystemIconURL( "paper" ), "Paper")))
         material = "".join(mat)
+        abst = []
+        if self._conf.getAbstractMgr().showAttachedFilesContribList() and isinstance(contrib, conference.AcceptedContribution) and len(contrib.getAbstract().getAttachments()) > 0:
+            for file in contrib.getAbstract().getAttachments().values():
+                abst.append("""<div style="padding-bottom:3px;"><a href="%s">%s</a></div>""" % (str(urlHandlers.UHAbstractAttachmentFileAccess.getURL(file)), file.getFileName()))
+        abstracts = "".join(abst)
         html = """
             <tr>
@@ -7529 +7536 @@
                 %s
                 <td class="abstractDataCell">%s</td>
+                <td class="abstractDataCell">%s</td>
             </tr>
                 """%(contrib.getId(), self.htmlText( contrib.getId() ),
                     sdate or "&nbsp;", typeHTML,
                     title or "&nbsp;", speaker or "&nbsp;",
-                    session or "&nbsp;", trackHTML, material or "&nbsp;" )
+                    session or "&nbsp;", trackHTML, material or "&nbsp;", abstracts or "&nbsp;" )
         return html
 
@@ -7546 +7554 @@
                 mat.append(self._getMaterialIcon(Config.getInstance().getSystemIconURL( "paper" ), _("Paper")))
         material = "".join(mat)
+        abst = []
+        if self._conf.getAbstractMgr().showAttachedFilesContribList() and isinstance(contrib, conference.AcceptedContribution) and len(contrib.getAbstract().getAttachments()) > 0:
+            for file in contrib.getAbstract().getAttachments().values():
+                abst.append("""<div style="padding-bottom:3px;"><a href="%s">%s</a></div>""" % (str(urlHandlers.UHAbstractAttachmentFileAccess.getURL(file)), file.getFileName()))
+        abstracts = "".join(abst)
         trackHTML = typeHTML = ""
         if self._displayTrackFilter:
@@ -7564 +7577 @@
                 %s
                 <td class="abstractDataCell">%s</td>
+                <td class="abstractDataCell">%s</td>
             </tr>
-                """%(self.htmlText( contrib.getId() ), "&nbsp;", "&nbsp;", typeHTML, title or "&nbsp;", "&nbsp;", "&nbsp;", trackHTML,  material or "&nbsp;" )
+                """%(self.htmlText( contrib.getId() ), "&nbsp;", "&nbsp;", typeHTML, title or "&nbsp;", "&nbsp;", "&nbsp;", trackHTML,  material or "&nbsp;", abstracts or "&nbsp;"  )
         return html
 
@@ -7783 +7797 @@
         vars["contribSelectionAction"]=quoteattr(str(urlHandlers.UHContributionListAction.getURL(self._conf)))
         vars["contributionsPDFURL"]=quoteattr(str(urlHandlers.UHContributionListToPDF.getURL(self._conf)))
+        vars["showAttachedFiles"] = self._conf.getAbstractMgr().showAttachedFilesContribList()
 
         return vars

indico/MaKaC/webinterface/pages/contributions.py

@@ -40 +40 @@
 from pytz import timezone
 import MaKaC.common.timezoneUtils as timezoneUtils
-
+from MaKaC.common.fossilize import fossilize
+from MaKaC.fossils.conference import ILocalFileAbstractMaterialFossil
 
 class WPContributionBase( WPMainBase, WPConferenceBase ):
@@ -306 +307 @@
         else:
             vars["hideInfo"] = False
-        return vars
+        vars["showAttachedFiles"] = self._contrib.getConference().getAbstractMgr().showAttachedFilesContribList() and isinstance(self._contrib, conference.AcceptedContribution) and len(self._contrib.getAbstract().getAttachments()) > 0
+        vars["abstractAttachments"] = fossilize(self._contrib.getAbstract().getAttachments().values(), ILocalFileAbstractMaterialFossil) if isinstance(self._contrib, conference.AcceptedContribution) else []
+        return vars
+
 
 

indico/MaKaC/webinterface/rh/CFADisplay.py

@@ -510 +510 @@
 
     def _checkProtection( self ):
-        # Same protection as the abstract
-        temptarget=self._target
-        self._target = self._target.getOwner()
-        RHFileAccess._checkProtection( self )
-        self._target = temptarget
+        if not self._conf.getAbstractMgr().showAttachedFilesContribList():
+            # Same protection as the abstract
+            temptarget=self._target
+            self._target = self._target.getOwner()
+            RHFileAccess._checkProtection( self )
+            self._target = temptarget

indico/MaKaC/webinterface/rh/conferenceModif.py

@@ -3396 +3396 @@
         self._redirect( urlHandlers.UHConfModifCFA.getURL( self._conf ) )
 
+class RHConfModifCFASwitchShowAttachedFilesContribList( RHConfModifCFABase ):
+
+    def _process( self ):
+        self._conf.getAbstractMgr().setSwitchShowAttachedFilesContribList(not self._conf.getAbstractMgr().showAttachedFilesContribList())
+        self._redirect( urlHandlers.UHConfModifCFA.getURL( self._conf ) )
+
 class RHCFAAddType( RHConfModifCFABase ):
 

indico/MaKaC/webinterface/tpls/ConfContributionList.tpl

@@ -65 +65 @@
                     ${ trackHeader }
                     <td nowrap class="titleCellFormat" style="border-right:5px solid #FFFFFF;border-left:5px solid #FFFFFF;border-bottom: 1px solid #5294CC;"> ${ _("Files")}</td>
+                    % if showAttachedFiles:
+                        <td nowrap class="titleCellFormat" style="border-right:5px solid #FFFFFF;border-left:5px solid #FFFFFF;border-bottom: 1px solid #5294CC;"> ${ _("Abstracts")}</td>
+                    % endif
+
                 </tr>
                 <form action=${ contribSelectionAction } method="post" target="_blank">

indico/MaKaC/webinterface/tpls/ConfModifCFA.tpl

@@ -79 +79 @@
                 <br/><img src="${ iconDisabled }" border="0"> <span id="makePresenterMandatory" style="color:#777"> ${makeMandSpk}</span>
             % endif
+            <br/><a href="${ showAttachedFilesUrl }" id="showAttachedFiles" data-active="${'yes' if showAttachedFilesContribList else 'no'}"><img src="${ iconEnabled if showAttachedFilesContribList else iconDisabled }" border="0"> ${ _("Show files attached to abstracts in the contribution list") }</a>
         </td>
     </tr>
@@ -108 +109 @@
 IndicoUI.executeOnLoad(function(){
     $('#makePresenterMandatory').qtip({content: "${_('This option is automatically disabled when the option \'Allow to choose the presenter(s) of the abstracts\' is also disabled')}", position: {my: 'top middle', at: 'bottom middle'}});
+    $('#showAttachedFiles').click(function(){
+        if(this.dataset.active=='no'){
+            return confirm($T("Please, note that if you enable this option the files (attached to the abstracts) will be public and accessible by everybody. Are you sure to continue?"));
+        }
+        return true;
+
+    })
 });
 </script>

indico/MaKaC/webinterface/tpls/ContributionDisplayFull.tpl

@@ -56 +56 @@
             ${ additionalFields }
                 % endif
+        % if showAttachedFiles:
+            <tr>
+                <td align="right" valign="top"
+                    class="displayField"><b>${ _("Abstract files")}:</b></td>
+                <td>
+                % for file in abstractAttachments:
+                    <div style="padding-bottom:3px;"><a href=${ file["url"] }>${ file["file"]["fileName"] }</a></div>
+                % endfor
+                </td>
+            </tr>
+        % endif
         <tr>
           <td align="right" valign="top" class="displayField"><b>${ _("Id")}:</b></td>

indico/MaKaC/webinterface/tpls/ContributionDisplayMin.tpl

@@ -20 +20 @@
                                 <td align="left" colspan="3">
                                     <table width="95%" align="center" valign="top" border="0">
+                                        % if showAttachedFiles:
+                                            <tr>
+                                                <td align="right" valign="top"
+                                                    class="displayField"><b>${ _("Abstract files")}:</b></td>
+                                                <td>
+                                                % for file in abstractAttachments:
+                                                    <div style="padding-bottom:3px;"><a href=${ file["url"] }>${ file["file"]["fileName"] }</a></div>
+                                                % endfor
+                                                </td>
+                                            </tr>
+                                        % endif
                                         <tr>
                                             <td align="right" valign="top"

indico/MaKaC/webinterface/urlHandlers.py

@@ -734 +734 @@
 class UHConfCFASelectSpeakerMandatory( URLHandler ):
     _relativeURL = "confModifCFA.py/switchSelectSpeakerMandatory"
+
+class UHConfCFAAttachedFilesContribList( URLHandler ):
+    _relativeURL = "confModifCFA.py/switchShowAttachedFiles"
 
 class UHCFAManagementAddType( URLHandler ):

indico/htdocs/confModifCFA.py

@@ -92 +92 @@
 def switchSelectSpeakerMandatory(req, **params):
     return conferenceModif.RHConfModifCFASwitchSelectSpeakerMandatory(req).process(params)
+
+def switchShowAttachedFiles(req, **params):
+    return conferenceModif.RHConfModifCFASwitchShowAttachedFilesContribList(req).process(params)