[Warp-framework-commits] CVS: warp_framework catalog.py,1.57.2.1,1.57.2.2 property_manager.py,1.53.2.1,1.53.2.2

[Myroslav O. <in...@us...>]

Update of /cvsroot/warp-framework/warp_framework
In directory usw-pr-cvs1:/tmp/cvs-serv20017

Modified Files:
      Tag: interra
	catalog.py property_manager.py 
Log Message:
Adding warp_id as unique identifier in framework. id of objects should serve readability purposes

Index: catalog.py
===================================================================
RCS file: /cvsroot/warp-framework/warp_framework/catalog.py,v
retrieving revision 1.57.2.1
retrieving revision 1.57.2.2
diff -C2 -r1.57.2.1 -r1.57.2.2
*** catalog.py	19 Jul 2002 00:42:28 -0000	1.57.2.1
--- catalog.py	21 Jul 2002 11:36:36 -0000	1.57.2.2
***************
*** 134,138 ****
      def get_parent_node_id(self):
          """Returns the id of the parent node."""
!         return self.get_parent_node().id
  
      def get_object_path(self, stop_at_product_instance=1):
--- 134,140 ----
      def get_parent_node_id(self):
          """Returns the id of the parent node."""
!         parent = self.get_parent_node()
!         # m.FIXME	getattr(...) should be removed. Present for compatibility only.
!         return getattr(parent, 'warp_id', parent.id)
  
      def get_object_path(self, stop_at_product_instance=1):

Index: property_manager.py
===================================================================
RCS file: /cvsroot/warp-framework/warp_framework/property_manager.py,v
retrieving revision 1.53.2.1
retrieving revision 1.53.2.2
diff -C2 -r1.53.2.1 -r1.53.2.2
*** property_manager.py	19 Jul 2002 00:42:28 -0000	1.53.2.1
--- property_manager.py	21 Jul 2002 11:36:36 -0000	1.53.2.2
***************
*** 97,102 ****
          for catalog_brain in self.get_catalog()(keywords,
                                   sort_on='get_object_title'):
!             # m.FIXME	Should be warp_id instead of id
!             options = options + ((catalog_brain.id,
                                   catalog_brain.cached_get_widget_title),)
          return options
--- 97,101 ----
          for catalog_brain in self.get_catalog()(keywords,
                                   sort_on='get_object_title'):
!             options = options + ((catalog_brain.warp_id,
                                   catalog_brain.cached_get_widget_title),)
          return options
***************
*** 110,115 ****
          for catalog_brain in self.get_catalog()(keywords,
                               sort_on='get_object_title'):
!             # m.FIXME	Should be warp_id instead of id
!             options = options + ((catalog_brain.id,
                        catalog_brain.cached_get_widget_title),)
          return options
--- 109,113 ----
          for catalog_brain in self.get_catalog()(keywords,
                               sort_on='get_object_title'):
!             options = options + ((catalog_brain.warp_id,
                        catalog_brain.cached_get_widget_title),)
          return options