[pod,px] Allow to reference an already defined variable instead of defining one in a var statement, via the '@' prefix. For example, in PX: var='@i = i + 1'. [pod] Repaired broken tests [gen] Bugfixes.

fields/computed.py

@@ -72,8 +72,9 @@ class Computed(Field):
         if not self.method: return
         if isinstance(self.method, Px):
             obj = obj.appy()
-            ctx = {'obj': obj, 'field': self,
+            tool = obj.tool
-                   '_': obj.translate, 'tool': obj.tool}
+            ctx = {'obj': obj, 'field': self, 'req': obj.request, 'tool': tool,
+                   '_': tool.translate, 'url': tool.o.getIncludeUrl}
             if self.context: ctx.update(self.context)
             return self.method(ctx)
         else:

gen/ui/appy.js

@@ -245,26 +245,30 @@ function toggleCheckbox(visibleCheckbox, hiddenBoolean) {
 }
 
 // Function that sets a value for showing/hiding sub-titles.
-function setSubTitles(value) {
+function setSubTitles(value, tag) {
   createCookie('showSubTitles', value);
   // Get the sub-titles
-  var subTitles = getElementsHavingName('div', 'subTitle');
+  var subTitles = getElementsHavingName(tag, 'subTitle');
   if (subTitles.length == 0) return;
+  // Define the display style depending on p_tag.
+  var displayStyle = 'inline';
+  if (tag == 'tr') displayStyle = 'table-row';
   for (var i=0; i < subTitles.length; i++) {
-    if (value == 'true') subTitles[i].style.display = 'inline';
+    if (value == 'true') subTitles[i].style.display = displayStyle;
     else subTitles[i].style.display = 'none';
   }
 }
 
 // Function that toggles the value for showing/hiding sub-titles.
-function toggleSubTitles() {
+function toggleSubTitles(tag) {
   // Get the current value
   var value = readCookie('showSubTitles');
   if (value == null) value = 'true';
   // Toggle the value
   var newValue = 'true';
   if (value == 'true') newValue = 'false';
-  setSubTitles(newValue);
+  if (!tag) tag = 'div';
+  setSubTitles(newValue, tag);
 }
 
 // Functions used for master/slave relationships between widgets

gen/wrappers/ToolWrapper.py

@@ -48,7 +48,7 @@ class ToolWrapper(AbstractWrapper):
              var="mustSortAndFilter=ajaxHookId == 'queryResult';
                   sortAndFilter=mustSortAndFilter and \
                     ',%s,%s,%s' % (q(sortKey),q(sortOrder),q(filterKey)) or ''">
-       <tr valign="middle">
+       <tr valign="bottom">
         <!-- Go to the first page -->
         <td if="(startNumber != 0) and (startNumber != batchSize)"><img
             class="clickable" src=":url('arrowLeftDouble')"
@@ -63,10 +63,10 @@ class ToolWrapper(AbstractWrapper):
                                           str(sNumber)+sortAndFilter)"/></td>
 
         <!-- Explain which elements are currently shown -->
-        <td class="discreet">&nbsp;
+        <td class="discreet"> 
-         <x>:startNumber + 1</x><img src=":url('to')"/>
+         <x>:startNumber + 1</x> <img src=":url('to')"/> 
-         <x>:startNumber + batchNumber</x>&nbsp;<b>//</b>
+         <x>:startNumber + batchNumber</x> <b>//</b> 
-         <x>:totalNumber</x>&nbsp;&nbsp;</td>
+         <x>:totalNumber</x> </td>
 
         <!-- Go to the next page -->
         <td var="sNumber=startNumber + batchSize"

gen/wrappers/UserWrapper.py

@@ -244,36 +244,41 @@ class UserWrapper(AbstractWrapper):
         # Call a custom "onDelete" if any.
         return self._callCustom('onDelete')
 
-    def getLogins(self):
+    def getLogins(self, groupsOnly=False):
-        '''Gets all the logins that can "match" this user: it own login and the
+        '''Gets all the logins that can "match" this user: it own login
-           logins of all the groups he belongs to.'''
+           (excepted if p_groupsOnly is True) and the logins of all the groups
-        # Try first to get those logins from a cache on the request.
+           he belongs to.'''
-        try:
+        # Try first to get those logins from a cache on the request, if this
-            return self.request.userLogins
+        # user corresponds to the logged user.
-        except AttributeError:
+        rq = self.request
-            res = [group.login for group in self.groups]
+        if (self.user == self) and hasattr(rq, 'userLogins'):
-            res.append(self.login)
+            return rq.userLogins
-            return res
+        # Compute it.
+        res = [group.login for group in self.groups]
+        if not groupsOnly: res.append(self.login)
+        return res
 
     def getRoles(self):
         '''This method returns all the global roles for this user, not simply
            self.roles, but also "ungrantable roles" (like Anonymous or
            Authenticated) and roles inherited from group membership.'''
-        # Try first to get those roles from a cache on the request.
+        # Try first to get those roles from a cache on the request, if this user
-        try:
+        # corresponds to the logged user.
-            return self.request.userRoles
+        rq = self.request
-        except AttributeError:
+        if (self.user == self) and hasattr(rq, 'userRoles'):
-            res = list(self.roles)
+            return rq.userRoles
-            # Add ungrantable roles
+        # Compute it.
-            if self.o.id == 'anon':
+        res = list(self.roles)
-                res.append('Anonymous')
+        # Add ungrantable roles
-            else:
+        if self.o.id == 'anon':
-                res.append('Authenticated')
+            res.append('Anonymous')
-            # Add group global roles
+        else:
-            for group in self.groups:
+            res.append('Authenticated')
-                for role in group.roles:
+        # Add group global roles
-                    if role not in res: res.append(role)
+        for group in self.groups:
-            return res
+            for role in group.roles:
+                if role not in res: res.append(role)
+        return res
 
     def getRolesFor(self, obj):
         '''Gets the roles the user has in the context of p_obj: its global roles

gen/wrappers/__init__.py

@@ -38,26 +38,21 @@ class AbstractWrapper(object):
                      or gotoSource"
          src=":url('gotoSource')" title=":goBack"/></a>
 
-      <!-- Go to the first page -->
+      <!-- Go to the first or previous page -->
       <a if="ni.firstUrl" href=":ni.firstUrl"><img title=":_('goto_first')"
-         src=":url('arrowLeftDouble')"/></a>
+         src=":url('arrowLeftDouble')"/></a><a
-
+         if="ni.previousUrl" href=":ni.previousUrl"><img
-      <!-- Go to the previous page -->
-      <a if="ni.previousUrl" href=":ni.previousUrl"><img
          title=":_('goto_previous')" src=":url('arrowLeftSimple')"/></a>
 
       <!-- Explain which element is currently shown -->
-      <span class="discreet">&nbsp;
+      <span class="discreet"> 
-       <x>:ni.currentNumber</x>&nbsp;<b>//</b>
+       <x>:ni.currentNumber</x> <b>//</b> 
-       <x>:ni.totalNumber</x>&nbsp;&nbsp;
+       <x>:ni.totalNumber</x> </span>
-      </span>
 
-      <!-- Go to the next page -->
+      <!-- Go to the next or last page -->
       <a if="ni.nextUrl" href=":ni.nextUrl"><img title=":_('goto_next')"
-         src=":url('arrowRightSimple')"/></a>
+         src=":url('arrowRightSimple')"/></a><a
-
+         if="ni.lastUrl" href=":ni.lastUrl"><img title=":_('goto_last')"
-      <!-- Go to the last page -->
-      <a if="ni.lastUrl" href=":ni.lastUrl"><img title=":_('goto_last')"
          src=":url('arrowRightDouble')"/></a>
      </div>''')
 
@@ -289,13 +284,14 @@ class AbstractWrapper(object):
 
     # This PX displays an object's history.
     pxHistory = Px('''
-     <x var="startNumber=req.get'startNumber', 0);
+     <x var="startNumber=req.get('startNumber', 0);
              startNumber=int(startNumber);
              batchSize=int(req.get('maxPerPage', 5));
              historyInfo=zobj.getHistory(startNumber,batchSize=batchSize)"
         if="historyInfo.events"
         var2="objs=historyInfo.events;
               totalNumber=historyInfo.totalNumber;
+              batchNumber=len(objs);
               ajaxHookId='appyHistory';
               navBaseCall='askObjectHistory(%s,%s,%d,**v**)' % \
                 (q(ajaxHookId), q(zobj.absolute_url()), batchSize)">
@@ -329,7 +325,7 @@ class AbstractWrapper(object):
          <x if="not actorId">?</x>
          <x if="actorId">:ztool.getUserName(actorId)</x>
         </td>
-        <td>:ztool.formatDate(event['time'], withHour=True)"></td>
+        <td>:ztool.formatDate(event['time'], withHour=True)</td>
         <td if="not isDataChange">
          <x if="rhComments">::zobj.formatText(rhComments)</x>
          <x if="not rhComments">-</x>
@@ -392,7 +388,7 @@ class AbstractWrapper(object):
      <div if="not zobj.isTemporary()"
           var2="hasHistory=zobj.hasHistory();
                 historyMaxPerPage=req.get('maxPerPage', 5);
-                historyExpanded=req.get('appyHistory','collapsed') == 'expanded';
+                historyExpanded=req.get('appyHistory','collapsed')=='expanded';
                 creator=zobj.Creator()">
       <table width="100%" class="summary">
        <tr>
@@ -400,19 +396,19 @@ class AbstractWrapper(object):
          <!-- Plus/minus icon for accessing history -->
          <x if="hasHistory">
           <img class="clickable" onclick="toggleCookie('appyHistory')"
-              src="historyExpanded and url('collapse.gif') or url('expand.gif')"
+             src=":historyExpanded and url('collapse.gif') or url('expand.gif')"
-              align=":dleft" id="appyHistory_img"/>
+             align=":dleft" id="appyHistory_img" style="padding-right:4px"/>
           <x>:_('object_history')</x> || 
          </x>
 
          <!-- Creator and last modification date -->
-         <x>:_('object_created_by')</x><x>:ztool.getUserName(creator)</x>
+         <x>:_('object_created_by')</x> <x>:ztool.getUserName(creator)</x>
          
          <!-- Creation and last modification dates -->
          <x>:_('object_created_on')</x>
          <x var="creationDate=zobj.Created();
                  modificationDate=zobj.Modified()">
-          <x>:ztool.formatDate(creationDate, withHour=True)></x>
+          <x>:ztool.formatDate(creationDate, withHour=True)</x>
           <x if="modificationDate != creationDate">&mdash;
            <x>:_('object_modified_on')</x>
            <x>:ztool.formatDate(modificationDate, withHour=True)</x>
@@ -430,9 +426,9 @@ class AbstractWrapper(object):
        <tr if="hasHistory">
         <td colspan="2">
          <span id="appyHistory"
-               style=":historyExpanded and 'display:block' or 'display:none')">
+               style=":historyExpanded and 'display:block' or 'display:none'">
           <div var="ajaxHookId=zobj.UID() + '_history'" id=":ajaxHookId">
-           <script type="text/javascript">:'askObjectHistory(%s,%s,%d,0)' % \
+           <script type="text/javascript">::'askObjectHistory(%s,%s,%d,0)' % \
              (q(ajaxHookId), q(zobj.absolute_url()), \
               historyMaxPerPage)</script>
           </div>

pod/actions.py

@@ -346,6 +346,10 @@ class VariablesAction(BufferAction):
             # Evaluate variable expression in vRes.
             vRes, error = self.evaluateExpression(result, context, expr)
             if error: return
+            # Replace the value of global variables
+            if name.startswith('@'):
+                context[name[1:]] = vRes
+                continue
             # Remember the variable previous value if already in the context
             if name in context:
                 if not hidden:
@@ -364,6 +368,7 @@ class VariablesAction(BufferAction):
         if hidden: context.update(hidden)
         # Delete not-hidden variables
         for name, expr in self.variables:
+            if name.startswith('@'): continue
             if hidden and (name in hidden): continue
             del context[name]
 # ------------------------------------------------------------------------------

pod/buffers.py

@@ -242,7 +242,7 @@ class MemoryBuffer(Buffer):
     actionRex = re.compile('(?:(\w+)\s*\:\s*)?do\s+(\w+)(-)?' \
                            '(?:\s+(for|if|else|with)\s*(.*))?')
     forRex = re.compile('\s*([\w\-_]+)\s+in\s+(.*)')
-    varRex = re.compile('\s*([\w\-_]+)\s*=\s*(.*)')
+    varRex = re.compile('\s*(@?[\w\-_]+)\s*=\s*(.*)')
 
     def __init__(self, env, parent):
         Buffer.__init__(self, env, parent)