Changeset 752 for ZMS/trunk/zmsobject.py


Ignore:
Timestamp:
26.10.2009 17:53:28 (3 years ago)
Author:
chris
Message:

zms-2.11.4-02

File:
1 edited

Legend:

Unmodified
Added
Removed

  • ZMS/trunk/zmsobject.py

    r750 r752  
    2424# Imports. 
    2525from __future__ import nested_scopes 
    26 from Globals import HTMLFile 
     26from App.special_dtml import HTMLFile 
    2727from types import StringTypes 
    28 from webdav.Lockable import ResourceLockedError 
    2928import ZPublisher.HTTPRequest 
    3029import urllib 
    … …  
    572571       
    573572      self._checkZMSLock() 
    574       self._checkWebDAVLock() 
    575573      message = '' 
    576574      messagekey = 'manage_tabs_message' 
    … …  
    882880      req = self.REQUEST 
    883881      if self.isCheckedOut(req) and not self.isCheckedOutByMe(req): 
    884         raise ResourceLockedError, 'This Object is locked by another user' 
     882        raise 'ResourceLockedError', 'This Object is locked by another user' 
    885883 
    886884    # -------------------------------------------------------------------------- 
    … …  
    14021400    def manage_moveObjUp(self, lang, REQUEST, RESPONSE): 
    14031401      """ ZMSObject.manage_moveObjUp """ 
    1404       self._checkWebDAVLock() 
    14051402      parent = self.getParentNode() 
    14061403      sort_id = self.getSortId() 
    … …  
    14191416    def manage_moveObjDown(self, lang, REQUEST, RESPONSE): 
    14201417      """ ZMSObject.manage_moveObjDown """ 
    1421       self._checkWebDAVLock() 
    14221418      parent = self.getParentNode() 
    14231419      sort_id = self.getSortId() 
    … …  
    14361432    def manage_moveObjToPos(self, lang, pos, REQUEST, RESPONSE): 
    14371433      """ ZMSObject.manage_moveObjToPos """ 
    1438       self._checkWebDAVLock() 
    14391434      parent = self.getParentNode() 
    14401435      if pos == 1: 
Note: See TracChangeset for help on using the changeset viewer.