display_type fixed

zms-publishing · Jul 21, 2023 · ba3a29b · ba3a29b
1 parent 94650ea
commit ba3a29b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/Products/zms/ZMSMetaobjManager.py b/Products/zms/ZMSMetaobjManager.py
@@ -500,7 +500,7 @@ def getMetaobjIds(self, sort=None, excl_ids=[]):
         ids = [x for x in ids if x not in excl_ids]
       # sort
       if sort == True:
-        ids = sorted(ids,key=lambda x:self.display_type(self.REQUEST, x))
+        ids = sorted(ids,key=lambda x:self.display_type(meta_id=x))
       elif sort == False:
         ids = sorted(ids,key=lambda x:obs[x].get('name',x))
       return ids

diff --git a/Products/zms/_objchildren.py b/Products/zms/_objchildren.py
@@ -194,7 +194,7 @@ def manage_initObjChild(self, id, type, lang, REQUEST, RESPONSE=None):
 
       # Return with message.
       if RESPONSE is not None:
-        message = self.getZMILangStr('MSG_INSERTED')%obj.display_type(W)
+        message = self.getZMILangStr('MSG_INSERTED')%obj.display_type(meta_id=obj.meta_id)
         message = standard.url_quote(message)
         target = REQUEST.get('manage_target', '%s/manage_main'%obj.id)
         RESPONSE.redirect('%s?lang=%s&manage_tabs_message=%s'%(target, lang, message))

diff --git a/Products/zms/conf/metaobj_manager/com.zms.foundation/ZMSGraphic/titlealt.py b/Products/zms/conf/metaobj_manager/com.zms.foundation/ZMSGraphic/titlealt.py
@@ -17,10 +17,10 @@
         if len(titlealt) < 24:
             return titlealt
         else:
-            return '%s...'%(titlealt)
+            return '%s...'%titlealt
     else:
         return img.getFilename() 
 except:
-    return zmscontext.display_type(zmscontext.REQUEST)
+    return zmscontext.display_type()
 
 # --// EO titlealt //--
diff --git a/Products/zms/zmscustom.py b/Products/zms/zmscustom.py
@@ -113,7 +113,7 @@ def manage_addZMSCustom(self, meta_id, lang, _sort_id, btn, REQUEST, RESPONSE):
       # Normalize Sort-Ids
       self.normalizeSortIds(id_prefix)
       # Message
-      message = self.getZMILangStr('MSG_INSERTED')%obj.display_type(W)
+      message = self.getZMILangStr('MSG_INSERTED')%obj.display_type(meta_id=obj.meta_id)
     except:
       message = standard.writeError(self, "[manage_addZMSCustom]")
       messagekey = 'manage_tabs_error_message'
@@ -679,7 +679,7 @@ def manage_import(self, file, lang, REQUEST, RESPONSE=None):
 
       else:
         ob = _importable.importFile( self, file, REQUEST, _importable.importContent)
-        message = self.getZMILangStr('MSG_IMPORTED')%('<em>%s</em>'%ob.display_type(W))
+        message = self.getZMILangStr('MSG_IMPORTED')%('<em>%s</em>'%ob.display_type())
 
       # Return with message.
       if RESPONSE is not None:

diff --git a/Products/zms/zmslinkelement.py b/Products/zms/zmslinkelement.py
@@ -296,8 +296,8 @@ def getTitlealt(self, REQUEST):
       else:
         proxy = self.getProxy()
         rtn = self.getTitlealtPROXY( proxy, REQUEST)
-      if len(rtn) == 0:
-        rtn = self.display_type(W)
+      if not rtn:
+        rtn = self.display_type(meta_id=self.meta_id)
       return rtn