# HG changeset patch
# User Sverre Rabbelier <srabbelier@gmail.com>
# Date 1228563068 0
# Node ID 2433d5c1d7e6b24830d734a3b0d446e8e7ff3bcc
# Parent  c8f9281f535b15ae40e808b7f96c1128246c50fc
Partial revert

Last commit contained some changes that did not belong there, revert
them for now.

Patch by: Sverre Rabbelier

diff -r c8f9281f535b -r 2433d5c1d7e6 app/soc/logic/models/base.py
--- a/app/soc/logic/models/base.py	Sat Dec 06 11:26:15 2008 +0000
+++ b/app/soc/logic/models/base.py	Sat Dec 06 11:31:08 2008 +0000
@@ -77,15 +77,6 @@
 
     return self._scope_logic
 
-  def getScopeDepth(self):
-    """
-    """
-
-    if self._scope_logic:
-      return 1 + self._scope_logic.logic.getScopeDepth()
-
-    return 0
-
   def _updateField(self, model, name, value):
     """Hook called when a field is updated.
 
diff -r c8f9281f535b -r 2433d5c1d7e6 app/soc/views/helper/params.py
--- a/app/soc/views/helper/params.py	Sat Dec 06 11:26:15 2008 +0000
+++ b/app/soc/views/helper/params.py	Sat Dec 06 11:31:08 2008 +0000
@@ -241,16 +241,11 @@
       first part of the returned pattern.
   """
 
-  logic = params['logic']
-  names = logic.getKeyFieldNames()
+  names = params['logic'].getKeyFieldNames()
   patterns = params['key_fields_prefix']
 
   for name in names:
-    regexp = linkable.LINK_ID_PATTERN_CORE
-    if name == 'scope_path':
-      regexp = '/'.join((regexp for i in range(logic.getScopeDepth())))
-
-    pattern = r'(?P<%s>%s)' % (name, regexp)
+    pattern = r'(?P<%s>%s)' % (name, linkable.LINK_ID_PATTERN_CORE)
     patterns.append(pattern)
 
   result = '/'.join(patterns)