From: <mme...@us...> - 2010-01-21 14:01:14
|
Revision: 2072 http://bika.svn.sourceforge.net/bika/?rev=2072&view=rev Author: mmetcalfe Date: 2010-01-21 13:59:54 +0000 (Thu, 21 Jan 2010) Log Message: ----------- Renamed view; only allow manager to see file name 'errors' Modified Paths: -------------- BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/__init__.py BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/browser.zcml BikaVillage/Products.ftpreader/trunk/Products/ftpreader/configure.zcml BikaVillage/Products.ftpreader/trunk/Products/ftpreader/model/ftpreader.zargo Added Paths: ----------- BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/temperature_logs_view.py BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/templates/TemperatureLogs_view.pt Removed Paths: ------------- BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/ftpreaderview.py BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/templates/ftpreader_view.pt Modified: BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/__init__.py =================================================================== --- BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/__init__.py 2010-01-21 12:37:06 UTC (rev 2071) +++ BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/__init__.py 2010-01-21 13:59:54 UTC (rev 2072) @@ -36,7 +36,7 @@ # Additional # Classes -import ftpreaderview +import temperature_logs_view ##code-section init-module-footer #fill in your manual code here ##/code-section init-module-footer Modified: BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/browser.zcml =================================================================== --- BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/browser.zcml 2010-01-21 12:37:06 UTC (rev 2071) +++ BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/browser.zcml 2010-01-21 13:59:54 UTC (rev 2072) @@ -9,9 +9,9 @@ <browser:page for="*" - name="ftpreader_view" - class="Products.ftpreader.browser.ftpreaderview.ftpreader_view" - template="templates/ftpreader_view.pt" + name="TemperatureLogs_view" + class="Products.ftpreader.browser.temperature_logs_view.TemperatureLogs_view" + template="templates/TemperatureLogs_view.pt" permission="tlog.ViewLogs" /> @@ -23,7 +23,7 @@ <browser:page for="*" name="temperature_log_file_view" - class="Products.ftpreader.browser.ftpreaderview.ftpreader_view" + class="Products.ftpreader.browser.temperature_logs_view.TemperatureLogs_view" attribute="temperature_log_file_view" permission="tlog.ViewLogs" /> Deleted: BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/ftpreaderview.py =================================================================== --- BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/ftpreaderview.py 2010-01-21 12:37:06 UTC (rev 2071) +++ BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/ftpreaderview.py 2010-01-21 13:59:54 UTC (rev 2072) @@ -1,85 +0,0 @@ -# -*- coding: utf-8 -*- -# -# File: ftpreaderview.py -# -# Copyright (c) 2010 by [] -# Generator: ArchGenXML Version 2.4.1 -# http://plone.org/products/archgenxml -# -# GNU General Public License (GPL) -# - -__author__ = """unknown <unknown>""" -__docformat__ = 'plaintext' - -##code-section module-header #fill in your manual code here -import logging -from Products.CMFCore.utils import getToolByName - -logger = logging.getLogger('ftpreaderview') -##/code-section module-header - -from zope import interface -from zope import component -from Products.CMFPlone import utils -from Products.Five import BrowserView -from zope.interface import implements - -from Products.CMFDynamicViewFTI.browserdefault import BrowserDefaultMixin - - -class ftpreader_view(BrowserView): - """ - """ - - ##code-section class-header_ftpreader_view #fill in your manual code here - ##/code-section class-header_ftpreader_view - - - - def getFilters(self): - tool = getToolByName(self, 'portal_ftpreader') - if tool: - return tool.getFilters() - - - def temperature_log_file_view(self, filename): - tool = getToolByName(self, 'portal_ftpreader') - if tool: - logger.info('retrieve file %s', filename) - path = tool.retrieveFile(filename) - logger.info('received path %s', path) - url = self.request['URL'] - url = '/'.join(url.split('/')[:3]) #pull http://domain:port - url = ':'.join(url.split(':')[:2]) #pull http://domain - logger.info('Redirect to %s/%s' % (url, path)) - self.request.response.redirect('%s/%s' % (url, path)) - - - def getFilteredListing(self, filter=None): - tool = getToolByName(self, 'portal_ftpreader') - if tool: - return tool.getFilteredListing(filter) - - - def getVesselTuple(self): - tool = getToolByName(self, 'portal_ftpreader') - if tool: - return tool.getVesselTuple() - - - def getFiltersAndFilteredListing(self, filter=None): - tool = getToolByName(self, 'portal_ftpreader') - if tool: - return tool.getFiltersAndFilteredListing(filter) - - - def __init__(self, context, request): - self.context = context - self.request = request - ##/code-section class-header_ftpreader_view - -##code-section module-footer #fill in your manual code here -##/code-section module-footer - - Copied: BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/temperature_logs_view.py (from rev 2070, BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/ftpreaderview.py) =================================================================== --- BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/temperature_logs_view.py (rev 0) +++ BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/temperature_logs_view.py 2010-01-21 13:59:54 UTC (rev 2072) @@ -0,0 +1,85 @@ +# -*- coding: utf-8 -*- +# +# File: temperature_logs_view.py +# +# Copyright (c) 2010 by [] +# Generator: ArchGenXML Version 2.4.1 +# http://plone.org/products/archgenxml +# +# GNU General Public License (GPL) +# + +__author__ = """unknown <unknown>""" +__docformat__ = 'plaintext' + +##code-section module-header #fill in your manual code here +import logging +from Products.CMFCore.utils import getToolByName + +logger = logging.getLogger('temperature_logs_view') +##/code-section module-header + +from zope import interface +from zope import component +from Products.CMFPlone import utils +from Products.Five import BrowserView +from zope.interface import implements + +from Products.CMFDynamicViewFTI.browserdefault import BrowserDefaultMixin + + +class TemperatureLogs_view(BrowserView): + """ + """ + + ##code-section class-header_TemperatureLogs_view #fill in your manual code here + ##/code-section class-header_TemperatureLogs_view + + + + def getFilters(self): + tool = getToolByName(self, 'portal_ftpreader') + if tool: + return tool.getFilters() + + + def temperature_log_file_view(self, filename): + tool = getToolByName(self, 'portal_ftpreader') + if tool: + logger.info('retrieve file %s', filename) + path = tool.retrieveFile(filename) + logger.info('received path %s', path) + url = self.request['URL'] + url = '/'.join(url.split('/')[:3]) #pull http://domain:port + url = ':'.join(url.split(':')[:2]) #pull http://domain + logger.info('Redirect to %s/%s' % (url, path)) + self.request.response.redirect('%s/%s' % (url, path)) + + + def getFilteredListing(self, filter=None): + tool = getToolByName(self, 'portal_ftpreader') + if tool: + return tool.getFilteredListing(filter) + + + def getVesselTuple(self): + tool = getToolByName(self, 'portal_ftpreader') + if tool: + return tool.getVesselTuple() + + + def getFiltersAndFilteredListing(self, filter=None): + tool = getToolByName(self, 'portal_ftpreader') + if tool: + return tool.getFiltersAndFilteredListing(filter) + + + def __init__(self, context, request): + self.context = context + self.request = request + + +##code-section module-footer #fill in your manual code here +##/code-section module-footer + + Copied: BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/templates/TemperatureLogs_view.pt (from rev 2071, BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/templates/ftpreader_view.pt) =================================================================== --- BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/templates/TemperatureLogs_view.pt (rev 0) +++ BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/templates/TemperatureLogs_view.pt 2010-01-21 13:59:54 UTC (rev 2072) @@ -0,0 +1,60 @@ +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" + lang="en" + metal:use-macro="here/main_template/macros/master" + i18n:domain="plone"> +<body> + +<div metal:fill-slot="main"> + + <form name="ftpfolderview" + action="" + method="post" + tal:define=" + filter request/filter|nothing; + filters python:view.getVesselTuple(); + listing python:view.getFilteredListing(filter); + " + tal:attributes="action string:$here_url/$template_id"> + + <input type="hidden" name="submitted" value="1" /> + <select name="filter"> + <option value="">No Filter</option> + <tal:block tal:condition="python: 'Manager' in here.portal_membership.getAuthenticatedMember().getRoles()"> + <option + tal:condition="python: filter != '__show_errors__'" + value="__show_errors__">Show Errors</option> + <option + tal:condition="python: filter == '__show_errors__'" + value="__show_errors__" selected>Show Errors</option> + </tal:block> + <tal:block tal:repeat="valcode filters"> + <option + tal:condition="python:valcode[0] == filter" + tal:attributes="value python:valcode[0];" + tal:content="python:'%s : %s' % (valcode[0], valcode[1])" + selected> + </option> + <option + tal:condition="python:valcode[0] != filter" + tal:attributes="value python:valcode[0];" + tal:content="python:'%s : %s' % (valcode[0], valcode[1])"> + </option> + </tal:block> + </select> + + <input type="submit" name="search" value="Search" /> + + + <div tal:repeat="file listing"> + <a tal:condition="python: filter != '__show_errors__'" + tal:attributes="href string:$here_url/temperature_log_file_view?filename=$file" + tal:content="file"/> + <span tal:condition="python: filter == '__show_errors__'" + tal:content="file"/> + </div> + </form> + +</div> + +</body> +</html> Deleted: BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/templates/ftpreader_view.pt =================================================================== --- BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/templates/ftpreader_view.pt 2010-01-21 12:37:06 UTC (rev 2071) +++ BikaVillage/Products.ftpreader/trunk/Products/ftpreader/browser/templates/ftpreader_view.pt 2010-01-21 13:59:54 UTC (rev 2072) @@ -1,58 +0,0 @@ -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" - lang="en" - metal:use-macro="here/main_template/macros/master" - i18n:domain="plone"> -<body> - -<div metal:fill-slot="main"> - - <form name="ftpfolderview" - action="" - method="post" - tal:define=" - filter request/filter|nothing; - filters python:view.getVesselTuple(); - listing python:view.getFilteredListing(filter); - " - tal:attributes="action string:$here_url/$template_id"> - - <input type="hidden" name="submitted" value="1" /> - <select name="filter"> - <option value="">No Filter</option> - <option - tal:condition="python: filter != '__show_errors__'" - value="__show_errors__">Show Errors</option> - <option - tal:condition="python: filter == '__show_errors__'" - value="__show_errors__" selected>Show Errors</option> - <tal:block tal:repeat="valcode filters"> - <option - tal:condition="python:valcode[0] == filter" - tal:attributes="value python:valcode[0];" - tal:content="python:'%s : %s' % (valcode[0], valcode[1])" - selected> - </option> - <option - tal:condition="python:valcode[0] != filter" - tal:attributes="value python:valcode[0];" - tal:content="python:'%s : %s' % (valcode[0], valcode[1])"> - </option> - </tal:block> - </select> - - <input type="submit" name="search" value="Search" /> - - - <div tal:repeat="file listing"> - <a tal:condition="python: filter != '__show_errors__'" - tal:attributes="href string:$here_url/temperature_log_file_view?filename=$file" - tal:content="file"/> - <span tal:condition="python: filter == '__show_errors__'" - tal:content="file"/> - </div> - </form> - -</div> - -</body> -</html> Modified: BikaVillage/Products.ftpreader/trunk/Products/ftpreader/configure.zcml =================================================================== --- BikaVillage/Products.ftpreader/trunk/Products/ftpreader/configure.zcml 2010-01-21 12:37:06 UTC (rev 2071) +++ BikaVillage/Products.ftpreader/trunk/Products/ftpreader/configure.zcml 2010-01-21 13:59:54 UTC (rev 2072) @@ -4,19 +4,21 @@ xmlns:i18n="http://namespaces.zope.org/i18n" i18n_domain="ftpreader"> + <i18n:registerTranslations directory="locales" /> + + <include file="profiles.zcml" /> + + + <!-- ##code-section configure.zcml --> + <!-- BEWARE: THIS SECTION GETS MOVED BELOW include browser.zcml + BY archgenxml AND PREVENTS THIS PERMISSION TO BE + USED BY browser.zcml AND APP WONT START --> <permission id="tlog.ViewLogs" title="TLog: View Logs" /> <!-- ##/code-section configure.zcml --> - <i18n:registerTranslations directory="locales" /> - - <include file="profiles.zcml" /> - - <include file="browser/browser.zcml"/> - - </configure> Modified: BikaVillage/Products.ftpreader/trunk/Products/ftpreader/model/ftpreader.zargo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |