fixed delete of content-object attributes

svn path=/ZMS/branches/zms4/; revision=5776

Author: zmsdev

Products/zms/ZMSMetaobjManager.py

@@ -1045,7 +1045,7 @@ def manage_changeProperties(self, lang, btn='', key='all', REQUEST=None, RESPONS
           # Delete.
           # -------
           # Delete Object.
-          if key == 'obj' and btn == 'BTN_DELETE':
+          if btn == 'BTN_DELETE' and key == 'obj':
             if id:
               meta_ids = [id]
             else:
@@ -1063,7 +1063,7 @@ def manage_changeProperties(self, lang, btn='', key='all', REQUEST=None, RESPONS
             id = ''
             message = self.getZMILangStr('MSG_DELETED')%len(meta_ids)
           # Delete Attribute.
-          elif key == 'attr' and btn == 'delete':
+          elif btn == 'BTN_DELETE' and key == 'attr':
             attr_id = REQUEST['attr_id']
             self.delMetaobjAttr( id, attr_id)