Menu
▾
▴
ztm-checkins — Notification of CVS commits.
You can subscribe to this list here.
| 2004 |
Jan
(35) |
Feb
(166) |
Mar
(150) |
Apr
(70) |
May
(81) |
Jun
(72) |
Jul
(107) |
Aug
(31) |
Sep
(10) |
Oct
(35) |
Nov
(11) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Arnar L. <ar...@us...> - 2005-02-10 12:48:44
|
Update of /cvsroot/ztm/ZTM2/skins/ZTopicMap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7963/skins/ZTopicMap Removed Files: Tag: ZTM-2_5-BRANCH find_topics_window.dtml Log Message: Deprecated by the PageTemplate. --- find_topics_window.dtml DELETED --- |
|
From: Arnar L. <ar...@us...> - 2005-02-10 12:40:37
|
Update of /cvsroot/ztm/ZTM2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4593 Modified Files: Tag: ZTM-2_5-BRANCH Editing.py Log Message: Import missing PSI Index: Editing.py =================================================================== RCS file: /cvsroot/ztm/ZTM2/Editing.py,v retrieving revision 1.46.2.2 retrieving revision 1.46.2.3 diff -C2 -d -r1.46.2.2 -r1.46.2.3 *** Editing.py 3 Sep 2004 15:41:48 -0000 1.46.2.2 --- Editing.py 10 Feb 2005 12:40:26 -0000 1.46.2.3 *************** *** 31,35 **** from Utils import wrapObject, wrapObjects, objectInList, makeDate, lookupTopic ! from PSIs import occoverridePSI MARKER = [] --- 31,35 ---- from Utils import wrapObject, wrapObjects, objectInList, makeDate, lookupTopic ! from PSIs import occurrenceTypePSI, occoverridePSI MARKER = [] *************** *** 395,399 **** ) ) - # Return the (hopefully) sorted occurrence list --- 395,398 ---- |
|
From: Arnar L. <ar...@us...> - 2005-02-08 17:42:08
|
Update of /cvsroot/ztm/ZTMDefault In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14213 Modified Files: Tag: ZTM-2_5-BRANCH TMSTool.py Log Message: Id's should not start with integers so this missed the updates that was done to widget_occurrence_datetime Index: TMSTool.py =================================================================== RCS file: /cvsroot/ztm/ZTMDefault/TMSTool.py,v retrieving revision 1.19.2.4 retrieving revision 1.19.2.5 diff -C2 -d -r1.19.2.4 -r1.19.2.5 *** TMSTool.py 22 Nov 2004 13:17:03 -0000 1.19.2.4 --- TMSTool.py 8 Feb 2005 17:41:32 -0000 1.19.2.5 *************** *** 310,317 **** serial = occ.tm_serial value = request.form.get("occ_%s"%serial) ! date = request.form.get("%s_date"%value) ! if date: ! time = request.form.get("%s_date_time"%value, '05:00') date = date.strip() time = time.strip() --- 310,316 ---- serial = occ.tm_serial value = request.form.get("occ_%s"%serial) ! date = request.form.get("date_%s"%value) if date: ! time = request.form.get("date_time_%s"%value, '05:00') date = date.strip() time = time.strip() |
|
From: Arnar L. <ar...@us...> - 2004-11-22 13:31:20
|
Update of /cvsroot/ztm/ZTMDefault/skins/topicmanagementskin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7544 Added Files: Tag: ZTM-2_5-BRANCH widget_occurrence_bool.dtml Log Message: Added widget for boolean occurrences. --- NEW FILE: widget_occurrence_bool.dtml --- <dtml-let occtype="getType(wrap=True)"> <tr bgcolor="#d0d0d0"><td colspan="3" class="ztmnormal"><b><dtml-if "occtype"><dtml-var "occtype.getBaseName(scope=this())"><dtml-else>[Ingen type]:</dtml-if></b></td></tr> <tr> <td> <input type="hidden" name="occ_<dtml-var "tm_serial">:bool" value=""> <input id="l<dtml-var tm_serial>"<dtml-if getData> checked="checked"</dtml-if> type="checkbox" name="occ_<dtml-var "tm_serial">:bool"> <label for="l<dtml-var tm_serial>" class="ztmnormal"><dtml-var "occtype.getBaseName(topic.getTypes()[0])"></label> </td> <td align="left" valign="top" width="100%" colspan="2" class="ztmhelp"><dtml-var "retrieveOccurrenceHelpText(aq_parent, occtype)"></td> </tr> </dtml-let> |
|
From: Arnar L. <ar...@us...> - 2004-11-22 13:19:19
|
Update of /cvsroot/ztm/ZTMDefault/skins/topicmanagementskin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4972/skins/topicmanagementskin Added Files: Tag: ZTM-2_5-BRANCH widget_association_file.dtml Log Message: Widget for fileuploads inline in content_edit_form. --- NEW FILE: widget_association_file.dtml --- <script type="text/javascript"> function open_new_file_window(winurl) { if (checkdates() == false) { return false; } document.infoform.submit(); window.open(winurl, '', "toolbar=no,location=no,status=yes,menubar=no,scrollbars=yes,resizable=1,width=450,height=200"); } </script> <dtml-let anchor="assoctype.getId() + roletype.getId()"> <tr bgcolor="#d0d0d0"> <td colspan="3" class="ztm11px"> <a name="<dtml-var anchor>"></a> <strong><dtml-var "Topic.getRoleNameInAssoc(roletype, assoctype)"></strong> (Kan knyttes til <dtml-var "pretty_othertopictype_printer(otherplayers)"> gjennom assosiasjonstype <em>"<dtml-var "assoctype.getBaseName()">"</em>) </td> </tr> <tr> <td colspan="2"> <table border="0"> <dtml-in "Topic.getAssociationsNG(assoctype=(assoctype,), rolespec=(roletype,), otherrolespec=(otherroletype,), wrap=True)"> <dtml-let assoc="_.getitem('sequence-item')" othertopic="assoc.getOtherTopic(Topic, wrap=True)" otherrole="assoc.getRoleByPlayer(othertopic,wrap=True).getRoleSpec(wrap=True)"> <tr> <td nowrap class="ztm11px"> <dtml-var "_.repr(othertopic)"> <a href="<dtml-var "othertopic.absolute_url()">" target="_blank" style="text-decoration:underline"> <dtml-var "othertopic.getBaseName()"> </a> (<dtml-if "otherrole and otherrole.tm_serial != othertopic.getType(wrap=True).tm_serial"><dtml-var "otherrole.getBaseName()"> [<dtml-var "othertopic.getTypeName()">]<dtml-else><dtml-var "othertopic.getTypeName()"></dtml-if>) </td> <td width="100%"> <input type="submit" value="Slett" name="content_edit_form_remove_association:method" onclick="javascript:submit_assocform('<dtml-var "assoc.tm_serial">', '#<dtml-var anchor>');" class="ztm11px"/> </td> <td></td> </tr> </dtml-let> </dtml-in> </table> </td> <td align="left" valign="top" width="100%" class="ztmhelp"><dtml-var "Topic.retrieveAssocHelpText(Topic, assoctype)"></td> </tr> <dtml-let winurl="'select_topics_window?method=topic_add_associations&assoctype=' + assoctype.tm_serial + '&role=' + roletype.tm_serial + editFormMakeTopicTypesUrl(otherplayers)" winurl2="'new_file_window?method=topic_add_associations&assoctype=' + assoctype.tm_serial + '&role=' + roletype.tm_serial + '&otherrole=' + otherroletype.tm_serial"> <tr> <dtml-let number="_.random.randint(0, 10000)"> <td align="left"><input type="text" value="" name="text<dtml-var number>" align="left" class="ztm11px"/></td> <td align="left"><input type="button" value="Finn..." onclick="javascript:assoc_open_find_topic_window('<dtml-var winurl>','text<dtml-var number>')" class="ztm11px"/> <input type="button" value="Last opp ny..." onclick="javascript:return open_new_file_window('<dtml-var winurl2>');" class="ztm11px"></td> <td width="100%"> </td></dtml-let> </tr> </dtml-let> <tr><td colspan="3"> </td> </dtml-let> |
|
From: Arnar L. <ar...@us...> - 2004-11-22 13:18:10
|
Update of /cvsroot/ztm/ZTMDefault/skins/topicmanagementskin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4604/skins/topicmanagementskin Added Files: Tag: ZTM-2_5-BRANCH new_file.py new_file_window.pt Log Message: Widget for fileuploads inline in content_edit_form. --- NEW FILE: new_file.py --- ##parameters=REQUEST, RESPONSE form = REQUEST.form file = form.get('file', None) if file: folder = context.portal_url.aq_inner.filer filename = context.portal_topicmanagement.availableFileName(file.filename, folder) REQUEST.set('type_name', 'file') folder.invokeFactory(type_name='file', id=filename) topicfile = getattr(folder, filename) title = form.get('title') description = form.get('description') topicmap = context.getTopicMap() assoctype = form['assoctype'] roletype = form['roletype'] otherroletype = form['otherroletype'] topicbySerial = topicmap.getTopicBySerial assoctype = topicbySerial(assoctype) roletype = topicbySerial(roletype) otherroletype = topicbySerial(otherroletype) context.makeAssociation( othertopic=topicfile , assoctype=assoctype , roletype=roletype , otherroletype=otherroletype , scope=None ) filearchive = context.portal_url.aq_inner.filearchive filename = context.portal_topicmanagement.availableFileName( file.filename , filearchive ) filearchive.invokeFactory(type_name="File", id=filename) realfile = getattr(filearchive, filename) realfile.manage_upload(file) topicfile.setSubjectLocator(context.createLocator('x-zope-path:%s'%('/'.join(realfile.getPhysicalPath())))) return """<html><body><script type="text/javascript">opener.location.reload(); window.close();</script></body></html>""" --- NEW FILE: new_file_window.pt --- <html> <head> <title>Last opp bilde </title> <link rel="stylesheet" type="text/css" href="/portal/css/skin.css" tal:attributes="href string:${here/portal_url}/css/skin.css" /> <style type="text/css"> div.row { display:block; clear:both; } div.row label { float: left; text-align:right; width: 100px; } div.row input { clear:right; width: 20em; } div.row textarea { clear:right; width:20em; } </style> </head> <body> <div class="popup_window"> <h1>Last opp ny fil</h1> <form action="new_file" method="post" enctype="multipart/form-data" tal:attributes="action string:${here/absolute_url}/new_file"> <input type="hidden" name="assoctype" value="" tal:attributes="value request/assoctype"/> <input type="hidden" name="roletype" value="" tal:attributes="value request/role"/> <input type="hidden" name="otherroletype" value="" tal:attributes="value request/otherrole"/> <div class="row"> <label for="title">Tittel:</label> <input type="string" tabindex="1" name="title" value="" /> </div> <div class="row"> <label for="description">Description:</label> <textarea id="description" tabindex="2" name="description"></textarea> </div> <div class="row"> <label for="file">Fil:</label> <input type="file" name="file" tabindex="3" value=""> </div> <input type="submit" name="newfile" tabindex="4" value="Last opp"> </form> </div> </body> </html> |
|
From: Arnar L. <ar...@us...> - 2004-11-22 13:17:13
|
Update of /cvsroot/ztm/ZTMDefault In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4351 Modified Files: Tag: ZTM-2_5-BRANCH TMSTool.py Log Message: Add convenience function for retrieving filename from an upload. Performancefix for generating the foldertree when moving objects and TTW configuring of containertypes to be updated when we add new types. Index: TMSTool.py =================================================================== RCS file: /cvsroot/ztm/ZTMDefault/TMSTool.py,v retrieving revision 1.19.2.3 retrieving revision 1.19.2.4 diff -C2 -d -r1.19.2.3 -r1.19.2.4 *** TMSTool.py 7 Oct 2004 14:02:39 -0000 1.19.2.3 --- TMSTool.py 22 Nov 2004 13:17:03 -0000 1.19.2.4 *************** *** 23,26 **** --- 23,27 ---- from zExceptions import BadRequest from OFS.ObjectManager import bad_id + from OFS.PropertyManager import PropertyManager from OFS.SimpleItem import SimpleItem from Globals import InitializeClass, DTMLFile, package_home *************** *** 84,88 **** PortalZTMTool.defaulttopicftiname = 'ZTMDefault: Topic Content Default' ! class TMSTool(UniqueObject, ActionProviderBase, SimpleItem): """ The TMSTool consists of methods that tie the Topic Management parts of the ZTMDefault skin together with the topic map engine. --- 85,89 ---- PortalZTMTool.defaulttopicftiname = 'ZTMDefault: Topic Content Default' ! class TMSTool(UniqueObject, ActionProviderBase, PropertyManager, SimpleItem): """ The TMSTool consists of methods that tie the Topic Management parts of the ZTMDefault skin together with the topic map engine. *************** *** 99,102 **** --- 100,104 ---- manage_options = ActionProviderBase.manage_options \ + ({ 'label' : 'Overview', 'action' : 'manage_overview' },) \ + + PropertyManager.manage_options \ + SimpleItem.manage_options *************** *** 110,113 **** --- 112,118 ---- security.declareProtected(ViewManagementScreens, 'manage_installproduct') manage_installproduct = PageTemplateFile( 'installZTMDefault', localdir) + + _properties = PropertyManager._properties \ + + ({'id':'foldertypes', 'type': 'lines', 'mode': 'w'},) def __init__(self): *************** *** 117,120 **** --- 122,126 ---- {'label':'Install', 'action':'manage_installproduct'}, ) + self.manage_options + self.foldertypes = ['Portal Folder', 'CMF BTree Folder'] def manage_install(self, REQUEST, RESPONSE): *************** *** 189,193 **** """ for objpath in REQUEST.get('ids', []): ! object = self.restrictedTraverse(objpath) if object: object.aq_parent.manage_delObjects(object.getId()) --- 195,202 ---- """ for objpath in REQUEST.get('ids', []): ! try: ! object = self.restrictedTraverse(objpath) ! except: ! raise AssertionError, objpath if object: object.aq_parent.manage_delObjects(object.getId()) *************** *** 337,339 **** --- 346,384 ---- pw.doActionFor(resource, state_change_info.transition.getId()) + security.declareProtected(View, 'hasContentSubFolders') + def hasContentSubFolders(self, folder=None): + """ True if folder has subfolders. """ + if folder is None: + folder = self.aq_parent + + content = [] + for foldertype in self.foldertypes: + if folder._mt_index.has_key(foldertype): + content.extend([item for item in folder._mt_index[foldertype].values()]) + return content + + security.declareProtected(View, 'availableFileName') + def availableFileName(self, filename, folder): + """ Generates a filename based on the input url, that is available in + folder. + """ + origname = filename = filename + if bad_id(origname) and origname[1]==':': + # This is probably a MS Windows path. + filename = nt_basename(origname) + + basename, extension = splitext(filename) + + counter = 1 + while not folder.checkIdAvailable(filename): + filename = "%s-%d%s"%(basename, counter, extension) + counter += 1 + if counter >= 20: + if bad_id(origname) is not None: + raise BadRequest('The id "%s" contains characters illegal in URLs.' % escape(origname)) + if counter >= 100: + raise AssertionError, "You entered an endless loop. This should not have happened. Please write down the steps you used to trigger this bug and report it to the ZTM developers." + return filename + + InitializeClass(TMSTool) |
|
From: Arnar L. <ar...@us...> - 2004-11-12 14:53:11
|
Update of /cvsroot/ztm/ZTMPhoto/skins/ztmphoto In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15549 Modified Files: new_image.py Log Message: Remember to reindex so that albums are registered with the catalog. Index: new_image.py =================================================================== RCS file: /cvsroot/ztm/ZTMPhoto/skins/ztmphoto/new_image.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** new_image.py 6 Oct 2004 15:44:26 -0000 1.2 --- new_image.py 12 Nov 2004 14:53:01 -0000 1.3 *************** *** 47,50 **** --- 47,51 ---- raise AssertionError, "Unable to locate topic with serial %s"%albumserial image.makeAssociation(imagealbum, belongs, part, whole, scope=()) + image.reindexObject(idxs=['albumcategories']) # Construct Thumbnail. |
|
From: Arnar L. <ar...@us...> - 2004-11-12 14:47:07
|
Update of /cvsroot/ztm/ZTMPhoto/skins/ztmphoto In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13990 Modified Files: select_image_window.pt Log Message: Mulighet for å filtere på album i vindu for valg av bilder. Index: select_image_window.pt =================================================================== RCS file: /cvsroot/ztm/ZTMPhoto/skins/ztmphoto/select_image_window.pt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** select_image_window.pt 19 Oct 2004 11:58:10 -0000 1.3 --- select_image_window.pt 12 Nov 2004 14:46:58 -0000 1.4 *************** *** 3,17 **** <link rel="stylesheet" type="text/css" href="/portal/css/skin.css" tal:attributes="href string:${here/portal_url}/css/skin.css"/> <style type="text/css"> ! a.imagelink { ! color: black; text-decoration: none; } ! a.imagelink:hover { text-decoration: none; - color: white; } ! a.imagelink:visited { text-decoration: none; } img { border: thin solid black; --- 3,23 ---- <link rel="stylesheet" type="text/css" href="/portal/css/skin.css" tal:attributes="href string:${here/portal_url}/css/skin.css"/> <style type="text/css"> ! a { text-decoration: none; } ! a:hover { text-decoration: none; } ! a:visited { text-decoration: none; } + + a.imagelink { + color: black; + } + a.imagelink:hover { + color: white; + } + img { border: thin solid black; *************** *** 20,37 **** border-color: red; } div.imagefloat { margin-bottom: 1em; padding-left: 1em; background-color: #659ccc; float: left; ! vertical-align: center; width: 170px; height: 180px; } - div.imagefloat a { text-align: center; vertical-align: bottom; } div.spacer { clear: both; --- 26,45 ---- border-color: red; } + div.imagefloat { margin-bottom: 1em; padding-left: 1em; background-color: #659ccc; + display: block; float: left; ! text-align: center; width: 170px; height: 180px; } div.imagefloat a { text-align: center; vertical-align: bottom; } + div.spacer { clear: both; *************** *** 40,43 **** --- 48,52 ---- width: 100%; } + #SearchableText { margin-left: 1em; *************** *** 61,66 **** <input type="hidden" tal:replace="structure here/select_image_window_hidden"/> ! <label for="SearchableText">Søk:</label> <input id="SearchableText" type="string" name="SearchableText" tal:attributes="value request/SearchableText|nothing"/> <input id="search_button" type="submit" name="" value="Search" tal:attributes="name string:${template/getId}:method"/> </form> --- 70,87 ---- <input type="hidden" tal:replace="structure here/select_image_window_hidden"/> ! <label for="SearchableText">Søk etter:</label> <input id="SearchableText" type="string" name="SearchableText" tal:attributes="value request/SearchableText|nothing"/> + <label for="albumcategories">i album:</label> + <select id="albumcategories" name="albumcategories" + tal:define="albums here/portal_images/listImageAlbums; + selectedserial request/albumcategories | string:noserial"> + <option value="">Alle</option> + <option value=""></option> + <option value="" tal:repeat="album albums" + tal:attributes="value album/tm_serial; + selected python:album.tm_serial==selectedserial" + tal:content="album/Title"></option> + </select> + <input id="search_button" type="submit" name="" value="Search" tal:attributes="name string:${template/getId}:method"/> </form> *************** *** 70,74 **** <p tal:condition="not:performsearch"> Vennligst utfør ditt søk. ! <!--Please perform your search--> </p> <div tal:condition="performsearch"> --- 91,95 ---- <p tal:condition="not:performsearch"> Vennligst utfør ditt søk. ! <!--Please perform your search--> </p> <div tal:condition="performsearch"> *************** *** 78,82 **** Viser bildenummer<!--Displaying image number--> <span tal:replace="string:${results/start} til ${results/end} av ${results/length}" /> <!--hit<span tal:condition="results/multiple">s</span>.--> ! treff. </p> <a tal:condition="results/previous" --- 99,103 ---- Viser bildenummer<!--Displaying image number--> <span tal:replace="string:${results/start} til ${results/end} av ${results/length}" /> <!--hit<span tal:condition="results/multiple">s</span>.--> ! treff. </p> <a tal:condition="results/previous" *************** *** 94,103 **** <div class="container"> <div class="spacer"> </div> ! <div class="imagefloat" tal:repeat="image results/batch"> <p> ! <a tal:attributes="href string:javascript:submitForm('select_image', '${image/tm_serial}')"> ! <img tal:attributes="src image/object/portal_images/thumbnail/; alt image/Title; title image/Description" name="image" /> ! </a> </p> <p> --- 115,126 ---- <div class="container"> <div class="spacer"> </div> ! <div class="imagefloat" tal:repeat="image results/batch"> <p> ! <img name="image" ! tal:attributes="src image/object/portal_images/thumbnail/; ! alt image/Title; ! title image/Description; ! onclick string:javascript:submitForm('select_image', '${image/tm_serial}')"> </p> <p> |
|
From: Arnar L. <ar...@us...> - 2004-11-12 14:45:43
|
Update of /cvsroot/ztm/ZTMPhoto/skins/ztmphoto In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13721 Modified Files: select_image_window_hidden.py Log Message: Make setup aware of the new albumcategories index. Index: select_image_window_hidden.py =================================================================== RCS file: /cvsroot/ztm/ZTMPhoto/skins/ztmphoto/select_image_window_hidden.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** select_image_window_hidden.py 20 Sep 2004 16:04:13 -0000 1.1.1.1 --- select_image_window_hidden.py 12 Nov 2004 14:45:35 -0000 1.2 *************** *** 3,7 **** request = ns['request'] kwargs = request.form.copy() ! for item in ['SearchableText', 'select_image_window', 'performsearch', '']: if item in kwargs: del kwargs[item] --- 3,7 ---- request = ns['request'] kwargs = request.form.copy() ! for item in ['SearchableText', 'select_image_window', 'performsearch', 'albumcategories', '']: if item in kwargs: del kwargs[item] |
|
From: Arnar L. <ar...@us...> - 2004-11-12 14:44:37
|
Update of /cvsroot/ztm/ZTMPhoto/skins/ztmphoto In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13372 Added Files: albumcategories.py Log Message: Index which albums an image belongs to so that we can easily perform searches. --- NEW FILE: albumcategories.py --- if getattr(context, 'isTopic', False): for topictype in context.getTypes(): for si in topictype.getSubjectIndicators(): address = si.getAddress() if address == 'http://psi.emnekart.no/ztm/ztmphoto/#image': # This is an image, so we return a list of albums this image is # categorized in. topicmap = context.getTopicMap() from Products.ZTMPhoto.PSIs import partPSI, wholePSI, belongsPSI part = topicmap.getTopicBySubjectIdentifier(partPSI) whole = topicmap.getTopicBySubjectIdentifier(wholePSI) belongs = topicmap.getTopicBySubjectIdentifier(belongsPSI) topics = context.getAssociatedTopicsNG( assoctype=(belongs,) , rolespec=(part,) , otherrolespec=(whole,) ) return [topic.tm_serial for topic in topics] return [] |
|
From: Arnar L. <ar...@us...> - 2004-11-05 09:37:48
|
Update of /cvsroot/ztm/ZTMDefault/skins/zpt_topicmanagementskin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4399 Modified Files: Tag: ZTM-2_5-BRANCH folder_contents_generator.py Log Message: The previous checkin broke on folders where the user had ListFolderContents permissions on parent or grandparent folders because the 'up' line was lacked a value. Index: folder_contents_generator.py =================================================================== RCS file: /cvsroot/ztm/ZTMDefault/skins/zpt_topicmanagementskin/folder_contents_generator.py,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -C2 -d -r1.6.2.1 -r1.6.2.2 *** folder_contents_generator.py 4 Nov 2004 17:06:01 -0000 1.6.2.1 --- folder_contents_generator.py 5 Nov 2004 09:37:26 -0000 1.6.2.2 *************** *** 29,32 **** --- 29,33 ---- , 'portal_type' : '' , 'modifieddate': '' + , 'modifieddatestring': '' , 'type' : '' , 'owner' : '' |
|
From: Arnar L. <ar...@us...> - 2004-11-04 17:06:12
|
Update of /cvsroot/ztm/ZTMDefault/skins/zpt_topicmanagementskin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15090 Modified Files: Tag: ZTM-2_5-BRANCH folder_contents.pt folder_contents_generator.py Added Files: Tag: ZTM-2_5-BRANCH folder_contents_sort_queries.py Log Message: Dates were sorted as strings. Also you can now reverse the sort by pressing twice on the coloumn header. --- NEW FILE: folder_contents_sort_queries.py --- ##bind namespace=ns request = ns['request'] sortby = request.get('sortby', '') reverse = request.get('reverse', False) query = { 'title' : '?sortby=title' , 'can_modify' : '?sortby=can_modify' , 'type' : '?sortby=type' , 'modifieddate': '?sortby=modifieddate' , 'owner' : '?sortby=owner' , 'state' : '?sortby=state' } if not reverse and sortby: query[sortby] = query[sortby] + '&reverse:bool=True' return query Index: folder_contents_generator.py =================================================================== RCS file: /cvsroot/ztm/ZTMDefault/skins/zpt_topicmanagementskin/folder_contents_generator.py,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** folder_contents_generator.py 14 Jul 2004 20:02:56 -0000 1.6 --- folder_contents_generator.py 4 Nov 2004 17:06:01 -0000 1.6.2.1 *************** *** 75,79 **** tmp['portal_type'] = getTypeInfo(portal_type).getId() tmp['type'] = getTypeInfo(portal_type).Title() ! tmp['modifieddate'] = DateTime( content.ModificationDate() ).strftime("%d.%m.%y %H:%M") tmp['owner'] = content.Creator() tmp['state'] = pw.getInfoFor(content, 'review_state', '') --- 75,81 ---- tmp['portal_type'] = getTypeInfo(portal_type).getId() tmp['type'] = getTypeInfo(portal_type).Title() ! moddate = content.modified() ! tmp['modifieddatestring'] = moddate.strftime("%d.%m.%y %H:%M") ! tmp['modifieddate'] = moddate tmp['owner'] = content.Creator() tmp['state'] = pw.getInfoFor(content, 'review_state', '') *************** *** 92,95 **** --- 94,101 ---- filtered_content_list = [item for title, item in filtered_content_list] + reverse = request.get('reverse', False) + if reverse: + filtered_content_list.reverse() + if uplevel: filtered_content_list.insert(0, uplevel) Index: folder_contents.pt =================================================================== RCS file: /cvsroot/ztm/ZTMDefault/skins/zpt_topicmanagementskin/folder_contents.pt,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -C2 -d -r1.9.2.1 -r1.9.2.2 *** folder_contents.pt 28 Oct 2004 14:25:10 -0000 1.9.2.1 --- folder_contents.pt 4 Nov 2004 17:06:01 -0000 1.9.2.2 *************** *** 160,171 **** <col id="owner"> <col id="state"> ! <tr> <th class="selectbox"></th> ! <th class="title"><a href="" tal:attributes="href string:${request/URL}?sortby=title">Tittel</a></th> ! <th class="edit"><a href="" tal:attributes="href string:${request/URL}?sortby=can_modify">Rediger</a></th> ! <th class="type"><a href="" tal:attributes="href string:${request/URL}?sortby=type">Type</a></th> ! <th class="modified"><a href="" tal:attributes="href string:${request/URL}?sortby=modifieddate">Sist endret</a></th> ! <th class="owner"><a href="" tal:attributes="href string:${request/URL}?sortby=owner">Eier</a></th> ! <th class="state"><a href="" tal:attributes="href string:${request/URL}?sortby=state">Status</a></th> </tr> <tr class="even" tal:repeat="content here/folder_contents_generator" tal:attributes="class python:path('repeat/content/odd') and 'even' or 'odd'"> --- 160,171 ---- <col id="owner"> <col id="state"> ! <tr tal:define="query here/folder_contents_sort_queries"> <th class="selectbox"></th> ! <th class="title"><a href="" tal:attributes="href string:${request/URL}${query/title}">Tittel</a></th> ! <th class="edit"><a href="" tal:attributes="href string:${request/URL}${query/can_modify}">Rediger</a></th> ! <th class="type"><a href="" tal:attributes="href string:${request/URL}${query/type}">Type</a></th> ! <th class="modified"><a href="" tal:attributes="href string:${request/URL}${query/modifieddate}">Sist endret</a></th> ! <th class="owner"><a href="" tal:attributes="href string:${request/URL}${query/owner}">Eier</a></th> ! <th class="state"><a href="" tal:attributes="href string:${request/URL}${query/state}">Status</a></th> </tr> <tr class="even" tal:repeat="content here/folder_contents_generator" tal:attributes="class python:path('repeat/content/odd') and 'even' or 'odd'"> *************** *** 183,187 **** Innholdstype </td> ! <td class="modified" tal:content="structure python:content['modifieddate'].replace(' ', ' ')"> Siste redigeringsdato </td> --- 183,187 ---- Innholdstype </td> ! <td class="modified" tal:content="structure python:content['modifieddatestring'].replace(' ', ' ')"> Siste redigeringsdato </td> |
|
From: Arnar L. <ar...@us...> - 2004-11-04 12:30:12
|
Update of /cvsroot/ztm/ZTMDefault/skins/zpt_topicmanagementskin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15524 Modified Files: Tag: ZTM-2_5-BRANCH create_content.py Log Message: Usability improvment. If the contentobject was created in the last 7 seconds, it is likely that the user pressed the create-button twice. We therefore redirect to the edit view of the object. If there is more than 7 seconds since the creation we return to folder_contents with a simple warning that the object was not created because there was one there before. This should remove a class of unelegant crashes. Index: create_content.py =================================================================== RCS file: /cvsroot/ztm/ZTMDefault/skins/zpt_topicmanagementskin/create_content.py,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** create_content.py 16 Jul 2004 12:23:37 -0000 1.3 --- create_content.py 4 Nov 2004 12:29:47 -0000 1.3.2.1 *************** *** 20,25 **** --- 20,41 ---- contentid = context.portal_topicmanagement.generateRandomId() + if getattr(context, contentid, None) and contentid in context.objectIds(): + object = getattr(context, contentid) + if object.portal_type == type_name: + if object.created()>=DateTime()-0.00008: + # This is probably a doubleclick + RESPONSE.redirect("%s/%s"%( object.absolute_url() + , object.getTypeInfo().getActionById('edit') + )) + return + RESPONSE.redirect("%s/%s?%s"%( context.absolute_url() + , context.getTypeInfo().getActionById('folderContents') + , "portal_status_message=Det+er+allerede+innhold+med+denne+identiteten." + )) + return + REQUEST.set('type_name', type_name) context.invokeFactory(type_name=type_name, id=contentid, RESPONSE=RESPONSE) + #TODO: Handle failures more gracefully if not getattr(context, contentid, None): |
|
From: Arnar L. <ar...@us...> - 2004-10-28 14:33:23
|
Update of /cvsroot/ztm/ZTM2/skins/ZTopicMap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25143/skins/ZTopicMap Modified Files: Tag: ZTM-2_5-BRANCH find_template_window.dtml Log Message: Don't break when using VHM rewrites Index: find_template_window.dtml =================================================================== RCS file: /cvsroot/ztm/ZTM2/skins/ZTopicMap/find_template_window.dtml,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** find_template_window.dtml 6 Oct 2004 16:05:43 -0000 1.2.2.1 --- find_template_window.dtml 28 Oct 2004 14:33:11 -0000 1.2.2.2 *************** *** 19,24 **** <tr> <td> ! <input id="<dtml-var "template.virtual_url_path()">" type="radio" name="template" value="<dtml-var "template.absolute_url()">"> ! <label for="<dtml-var "template.virtual_url_path()">"><dtml-var "template.title_or_id()"></label> </td> </tr> --- 19,26 ---- <tr> <td> ! <dtml-let path="'/'.join(template.getPhysicalPath())"> ! <input id="<dtml-var path>" type="radio" name="template" value="<dtml-var path>"> ! <label for="<dtml-var path>"><dtml-var "template.title_or_id()"></label> ! </dtml-let> </td> </tr> |
|
From: Arnar L. <ar...@us...> - 2004-10-28 14:31:39
|
Update of /cvsroot/ztm/ZTM2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24756 Modified Files: Tag: ZTM-2_5-BRANCH Template.py Log Message: Allow passing of options into condensed and collapsed views Index: Template.py =================================================================== RCS file: /cvsroot/ztm/ZTM2/Template.py,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -C2 -d -r1.8.2.2 -r1.8.2.3 *** Template.py 8 Oct 2004 11:02:28 -0000 1.8.2.2 --- Template.py 28 Oct 2004 14:31:16 -0000 1.8.2.3 *************** *** 46,50 **** return method._exec({}, None, kw=kw) elif method.meta_type in ['Script (Python)']: ! return method() return method(self, kw) --- 46,50 ---- return method._exec({}, None, kw=kw) elif method.meta_type in ['Script (Python)']: ! return method(**kw) return method(self, kw) |
|
From: Arnar L. <ar...@us...> - 2004-10-28 14:30:47
|
Update of /cvsroot/ztm/ZTM2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24573 Modified Files: Tag: ZTM-2_5-BRANCH TypedObject.py Log Message: Ensure that when removing type the order actually comes from the items type. Index: TypedObject.py =================================================================== RCS file: /cvsroot/ztm/ZTM2/TypedObject.py,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** TypedObject.py 31 Jan 2004 03:16:44 -0000 1.5 --- TypedObject.py 28 Oct 2004 14:30:28 -0000 1.5.2.1 *************** *** 35,39 **** def onTypeDelete(self, eventdata): """ Handle the case where the typing object is going away """ ! self.setType(None) def getType(self, wrap=0): --- 35,40 ---- def onTypeDelete(self, eventdata): """ Handle the case where the typing object is going away """ ! if eventdata.source.tm_serial == getattr(self.getType(), 'tm_serial', 'NoTMSerial'): ! self.setType(None) def getType(self, wrap=0): |
|
From: Arnar L. <ar...@us...> - 2004-10-28 14:28:15
|
Update of /cvsroot/ztm/ZTM2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23941 Modified Files: Tag: ZTM-2_5-BRANCH Association.py AssociationRole.py Log Message: Fix identity deletion bug Index: Association.py =================================================================== RCS file: /cvsroot/ztm/ZTM2/Association.py,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -d -r1.12 -r1.12.2.1 *** Association.py 24 Jul 2004 20:06:20 -0000 1.12 --- Association.py 28 Oct 2004 14:27:51 -0000 1.12.2.1 *************** *** 52,56 **** """ Change the type of this association. """ old_type = self.getType() ! TypedObject.setType(self, topic) if not ignore: if self._topicmap: --- 52,56 ---- """ Change the type of this association. """ old_type = self.getType() ! TypedObject.setType(self, aq_base(topic)) if not ignore: if self._topicmap: Index: AssociationRole.py =================================================================== RCS file: /cvsroot/ztm/ZTM2/AssociationRole.py,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -C2 -d -r1.14 -r1.14.2.1 *** AssociationRole.py 24 Jul 2004 20:07:26 -0000 1.14 --- AssociationRole.py 28 Oct 2004 14:28:01 -0000 1.14.2.1 *************** *** 139,143 **** def onRoleSpecDelete(self, eventdata): """ Handle deletion of the topic spec'ing this role """ ! self.setRoleSpec(None) security.declareProtected(View, 'getRoleSpec') --- 139,144 ---- def onRoleSpecDelete(self, eventdata): """ Handle deletion of the topic spec'ing this role """ ! if aq_base(eventdata.source) is self.getRoleSpec(): ! self.setRoleSpec(None) security.declareProtected(View, 'getRoleSpec') |
|
From: Arnar L. <ar...@us...> - 2004-10-28 14:25:22
|
Update of /cvsroot/ztm/ZTMDefault/skins/zpt_topicmanagementskin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23439/skins/zpt_topicmanagementskin Modified Files: Tag: ZTM-2_5-BRANCH folder_contents.pt Log Message: Fix issue where one could not sort folder_contents on last modified. Index: folder_contents.pt =================================================================== RCS file: /cvsroot/ztm/ZTMDefault/skins/zpt_topicmanagementskin/folder_contents.pt,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** folder_contents.pt 28 Jul 2004 08:04:12 -0000 1.9 --- folder_contents.pt 28 Oct 2004 14:25:10 -0000 1.9.2.1 *************** *** 165,169 **** <th class="edit"><a href="" tal:attributes="href string:${request/URL}?sortby=can_modify">Rediger</a></th> <th class="type"><a href="" tal:attributes="href string:${request/URL}?sortby=type">Type</a></th> ! <th class="modified"><a href="" tal:attributes="href string:${request/URL}?sortby=modificationdate">Sist endret</a></th> <th class="owner"><a href="" tal:attributes="href string:${request/URL}?sortby=owner">Eier</a></th> <th class="state"><a href="" tal:attributes="href string:${request/URL}?sortby=state">Status</a></th> --- 165,169 ---- <th class="edit"><a href="" tal:attributes="href string:${request/URL}?sortby=can_modify">Rediger</a></th> <th class="type"><a href="" tal:attributes="href string:${request/URL}?sortby=type">Type</a></th> ! <th class="modified"><a href="" tal:attributes="href string:${request/URL}?sortby=modifieddate">Sist endret</a></th> <th class="owner"><a href="" tal:attributes="href string:${request/URL}?sortby=owner">Eier</a></th> <th class="state"><a href="" tal:attributes="href string:${request/URL}?sortby=state">Status</a></th> |
|
From: Arnar L. <ar...@us...> - 2004-10-28 14:23:36
|
Update of /cvsroot/ztm/ZTMDefault/skins/zpt_topicmanagementskin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23042/skins/zpt_topicmanagementskin Modified Files: Tag: ZTM-2_5-BRANCH select_topics_window.pt xhtml_mimetype.py Log Message: Report correct charset usage. This fixes a bug with odd characters in Firefox Index: xhtml_mimetype.py =================================================================== RCS file: /cvsroot/ztm/ZTMDefault/skins/zpt_topicmanagementskin/xhtml_mimetype.py,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** xhtml_mimetype.py 3 Feb 2004 15:41:37 -0000 1.1 --- xhtml_mimetype.py 28 Oct 2004 14:23:13 -0000 1.1.2.1 *************** *** 5,13 **** ##bind script=script ##bind subpath=traverse_subpath ! ##parameters=REQUEST=None ##title=Discovers if the browser supports application/xhtml+xml ## if REQUEST is None: REQUEST = context.REQUEST accepts = REQUEST.get('HTTP_ACCEPT', '*/*') accepts = accepts.split(',') --- 5,15 ---- ##bind script=script ##bind subpath=traverse_subpath ! ##parameters=REQUEST=None, RESPONSE=None, charset='' ##title=Discovers if the browser supports application/xhtml+xml ## if REQUEST is None: REQUEST = context.REQUEST + if charset: + charset = '; charset=%s'%(charset) accepts = REQUEST.get('HTTP_ACCEPT', '*/*') accepts = accepts.split(',') *************** *** 15,20 **** accept = accept.strip() if accept == 'text/html': ! return 'text/html' elif accept == 'application/xhtml+xml': ! return 'application/xhtml+xml' return 'text/html' --- 17,22 ---- accept = accept.strip() if accept == 'text/html': ! return 'text/html'+charset elif accept == 'application/xhtml+xml': ! return 'application/xhtml+xml'+charset return 'text/html' Index: select_topics_window.pt =================================================================== RCS file: /cvsroot/ztm/ZTMDefault/skins/zpt_topicmanagementskin/select_topics_window.pt,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** select_topics_window.pt 30 Jul 2004 08:54:35 -0000 1.2 --- select_topics_window.pt 28 Oct 2004 14:23:11 -0000 1.2.2.1 *************** *** 3,9 **** xmlns:tal="http://xml.zope.org/namespaces/tal" xmlns:metal="http://xml.zope.org/namespaces/metal" > ! <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', here.xhtml_mimetype(request))"> <title>Please select the topics you want to create an association with:</title> ! <meta http-equiv="Content-Type" content="text/html; charset=ISO8859-1" tal:attributes="content string:${here/xhtml_mimetype};; charset=ISO8859-1"/> <link rel="stylesheet" type="text/css" href="/portal/css/skin.css" tal:attributes="href string:${here/portal_url}/css/skin.css"/> <script tal:attributes="src string:${here/portal_url}/scripts/select_topics_window_clientscripts"></script> --- 3,9 ---- xmlns:tal="http://xml.zope.org/namespaces/tal" xmlns:metal="http://xml.zope.org/namespaces/metal" > ! <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', here.xhtml_mimetype(request, charset='iso-8859-1'))"> <title>Please select the topics you want to create an association with:</title> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" tal:attributes="content string:${here/xhtml_mimetype};; charset=iso-8859-1"/> <link rel="stylesheet" type="text/css" href="/portal/css/skin.css" tal:attributes="href string:${here/portal_url}/css/skin.css"/> <script tal:attributes="src string:${here/portal_url}/scripts/select_topics_window_clientscripts"></script> |
|
From: Arnar L. <ar...@us...> - 2004-10-28 14:20:54
|
Update of /cvsroot/ztm/ZTMDefault/skins/topicmanagementskin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22447/skins/topicmanagementskin Modified Files: Tag: ZTM-2_5-BRANCH templates_edit_form.dtml Log Message: Forgot to check in fix for names in the form when we updated the templates code. Index: templates_edit_form.dtml =================================================================== RCS file: /cvsroot/ztm/ZTMDefault/skins/topicmanagementskin/templates_edit_form.dtml,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** templates_edit_form.dtml 27 Jan 2004 17:32:23 -0000 1.1.1.1 --- templates_edit_form.dtml 28 Oct 2004 14:20:45 -0000 1.1.1.1.2.1 *************** *** 30,34 **** <form name="template_form" method="POST" action="topic_remove_template"> <input type="hidden" name="templatetype" value="view_template"/> ! <input type="hidden" name="template" value="None"/> <input type="button" value="Set" onclick="javascript:open_find_template_window('<dtml-var winurl>')" class="ztmnormal"/> --- 30,34 ---- <form name="template_form" method="POST" action="topic_remove_template"> <input type="hidden" name="templatetype" value="view_template"/> ! <input type="hidden" name="template" value=""/> <input type="button" value="Set" onclick="javascript:open_find_template_window('<dtml-var winurl>')" class="ztmnormal"/> *************** *** 49,54 **** <dtml-let winurl="'find_template_window?method=topic_set_condensed_template&templatetype=condensed_view'"> <form name="template_condensed_form" method="POST" action="topic_remove_template"> ! <input type="hidden" name="templatetype" value="condensed_view"/> ! <input type="hidden" name="template" value="None"/> <input type="button" value="Set" onclick="javascript:open_find_template_window('<dtml-var winurl>')" class="ztmnormal"/> --- 49,54 ---- <dtml-let winurl="'find_template_window?method=topic_set_condensed_template&templatetype=condensed_view'"> <form name="template_condensed_form" method="POST" action="topic_remove_template"> ! <input type="hidden" name="templatetype" value="condensed_view_template"/> ! <input type="hidden" name="template" value=""/> <input type="button" value="Set" onclick="javascript:open_find_template_window('<dtml-var winurl>')" class="ztmnormal"/> *************** *** 69,74 **** <dtml-let winurl="'find_template_window?method=topic_set_collapsed_template&templatetype=collapsed_view'"> <form name="template_collapsed_form" method="POST" action="topic_remove_template"> ! <input type="hidden" name="templatetype" value="collapsed_view"/> ! <input type="hidden" name="template" value="None"/> <input type="button" value="Set" onclick="javascript:open_find_template_window('<dtml-var winurl>')" class="ztmnormal"/> --- 69,74 ---- <dtml-let winurl="'find_template_window?method=topic_set_collapsed_template&templatetype=collapsed_view'"> <form name="template_collapsed_form" method="POST" action="topic_remove_template"> ! <input type="hidden" name="templatetype" value="collapsed_view_template"/> ! <input type="hidden" name="template" value=""/> <input type="button" value="Set" onclick="javascript:open_find_template_window('<dtml-var winurl>')" class="ztmnormal"/> *************** *** 84,86 **** </table> ! <dtml-var content_footer> \ No newline at end of file --- 84,86 ---- </table> ! <dtml-var content_footer> |
|
From: Arnar L. <ar...@us...> - 2004-10-28 14:17:53
|
Update of /cvsroot/ztm/ZTMDefault/skins/topicmanagementskin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21665/skins/topicmanagementskin Modified Files: Tag: ZTM-2_5-BRANCH content_edit_form_remove_association.py Log Message: Opera doesn't redirect when the target URL contains both a query and a parameter. Index: content_edit_form_remove_association.py =================================================================== RCS file: /cvsroot/ztm/ZTMDefault/skins/topicmanagementskin/content_edit_form_remove_association.py,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** content_edit_form_remove_association.py 1 May 2004 23:50:57 -0000 1.1 --- content_edit_form_remove_association.py 28 Oct 2004 14:17:43 -0000 1.1.2.1 *************** *** 9,13 **** ## assocserial = REQUEST.get('activeassoc', None) ! anchor = REQUEST.get('anchor', None) if not assocserial: msg = "No associations selected." --- 9,20 ---- ## assocserial = REQUEST.get('activeassoc', None) ! ! # This fixes an issue where Opera hangs when the redirect URL contains an ! # anchor, ! if REQUEST.HTTP_USER_AGENT.lower().find('opera')==-1: ! anchor = REQUEST.get('anchor', None) ! else: ! anchor = '' ! if not assocserial: msg = "No associations selected." *************** *** 23,25 **** RESPONSE.redirect("%s/%s?portal_status_message=%s%s"%(context.absolute_url(), context.getTypeInfo().getActionById('edit'), url_quote(msg), anchor)) - --- 30,31 ---- |
|
From: Arnar L. <ar...@us...> - 2004-10-28 14:15:23
|
Update of /cvsroot/ztm/ZTMDefault/skins/topicmanagementskin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20992/skins/topicmanagementskin Modified Files: Tag: ZTM-2_5-BRANCH content_edit_form.py Log Message: Use correct PSI Index: content_edit_form.py =================================================================== RCS file: /cvsroot/ztm/ZTMDefault/skins/topicmanagementskin/content_edit_form.py,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** content_edit_form.py 20 Sep 2004 13:29:41 -0000 1.3.2.1 --- content_edit_form.py 28 Oct 2004 14:15:12 -0000 1.3.2.2 *************** *** 9,13 **** ## topicmap = context.getTopicMap() ! scope = topicmap.getTopicBySubjectIdentifier('http://psi.emnekart.no/ztm/ztmdefault/#normaleditscope') method = getattr(context, 'topic_content_edit_form') return method(context, {'scope':scope, 'REQUEST':REQUEST, 'RESPONSE':RESPONSE, 'portal_status_message':REQUEST.get('portal_status_message', None)}) --- 9,13 ---- ## topicmap = context.getTopicMap() ! scope = topicmap.getTopicBySubjectIdentifier('http://psi.emnekart.no/ztm/ztmdefault/#edit_scope') method = getattr(context, 'topic_content_edit_form') return method(context, {'scope':scope, 'REQUEST':REQUEST, 'RESPONSE':RESPONSE, 'portal_status_message':REQUEST.get('portal_status_message', None)}) |
|
From: Arnar L. <ar...@us...> - 2004-10-19 14:28:12
|
Update of /cvsroot/ztm/ZTMDefault/skins/zpt_topicmanagementskin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14321 Modified Files: Tag: ZTM-2_5-BRANCH folder_contents_move.pt Log Message: Fix issue with use of VirtualHostMonster when moving content to the root of the portal. Index: folder_contents_move.pt =================================================================== RCS file: /cvsroot/ztm/ZTMDefault/skins/zpt_topicmanagementskin/folder_contents_move.pt,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** folder_contents_move.pt 7 Oct 2004 10:07:51 -0000 1.4.2.1 --- folder_contents_move.pt 19 Oct 2004 14:28:02 -0000 1.4.2.2 *************** *** 183,187 **** <th><img src="" title="" alt="" border="0" tal:attributes="src here/icon; title here/meta_type; alt here/meta_type" /></th> <th style="height:20px" tal:attributes="colspan python:root.maxdepth+1"> ! <a href="" tal:define="object nocall:root/object" tal:attributes="href string:${here/absolute_url}/folder_contents_move_confirm?target=${object/absolute_url_path}&${query}" tal:content="python:1 and object.Title() or object.getId()">Title</a> </th> --- 183,187 ---- <th><img src="" title="" alt="" border="0" tal:attributes="src here/icon; title here/meta_type; alt here/meta_type" /></th> <th style="height:20px" tal:attributes="colspan python:root.maxdepth+1"> ! <a href="" tal:define="object nocall:root/object; target python:'/'.join(object.getPhysicalPath())" tal:attributes="href string:${here/absolute_url}/folder_contents_move_confirm?target=${target}&${query}" tal:content="python:1 and object.Title() or object.getId()">Title</a> </th> |
|
From: Arnar L. <ar...@us...> - 2004-10-19 11:59:13
|
Update of /cvsroot/ztm/ZTMPhoto/skins/ztmphoto In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8176/skins/ztmphoto Modified Files: select_image_window_handler.py Log Message: Default to perform search if SearchableText is not empty on load. Index: select_image_window_handler.py =================================================================== RCS file: /cvsroot/ztm/ZTMPhoto/skins/ztmphoto/select_image_window_handler.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** select_image_window_handler.py 6 Oct 2004 15:54:28 -0000 1.2 --- select_image_window_handler.py 19 Oct 2004 11:59:03 -0000 1.3 *************** *** 22,25 **** --- 22,26 ---- result = context.portal_catalog(**kw) + request.set('performsearch', True) else: result = [] |