fix link list

collective · Feb 26, 2013 · 0db13c0 · 0db13c0
1 parent c230f92
commit 0db13c0
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/my315ok/products/browser/multiproducts.py b/my315ok/products/browser/multiproducts.py
@@ -225,12 +225,12 @@ def barview(self,scale="large",multiline=False):
                 for i in range(lenth):
                     headstr = headstr + '<link url="%s" /><title text="%s"> </title>' % (items['url'][i],items['titl'][i])
                     bodystr = bodystr + '<div class="banner"><a href="%s"><img src="%s" alt="%s" />%s</a></div>' \
-                    % (items['url'][i],items['src'][i],items['titl'][i],items['txt'][i])                
+                    % (items['link'][i],items['src'][i],items['titl'][i],items['txt'][i])                
             else:
                 for i in range(lenth):
                     headstr = headstr + '<link url="%s" /><title text="%s"> </title>' % (items['url'][i],items['titl'][i])
                     bodystr = bodystr + '<div class="banner"><a href="%s"><img src="%s" alt="%s" /></a></div>' \
-                    % (items['url'][i],items['src'][i],items['titl'][i])                
+                    % (items['link'][i],items['src'][i],items['titl'][i])                
         except:
             pass
         bars = {}
@@ -245,9 +245,9 @@ def imgitems_fast(self,fieldname="image",scale="large",tab=u"，"):
         items = {}
         items['titl'] = []
         items['url'] = []
+        items['link'] = []        
         items['src'] = []
-        items['txt'] = []
-
+        items['txt'] = []     
 
         if scale == "orig":
             for bn in brains:
@@ -256,11 +256,12 @@ def imgitems_fast(self,fieldname="image",scale="large",tab=u"，"):
                     link2 = bn.linkurl
                 except:
                     link2 = ""
-                if link2 != "": base = link2                
+                if link2 == "":  link2 = base                
                 items['titl'].append(bn.Title)
                 dsp = self.splittxt(bn.Description, tab)
                 items['txt'].append(dsp)
                 items['url'].append(base)
+                items['link'].append(link2)  
                 items['src'].append(base + "/@@images/" + fieldname)          
             return items
         else:            
@@ -270,11 +271,12 @@ def imgitems_fast(self,fieldname="image",scale="large",tab=u"，"):
                     link2 = bn.linkurl
                 except:
                     link2 = ""
-                if link2 != "": base = link2                
+                if link2 == "":  link2 = base                
                 items['titl'].append(bn.Title)
                 dsp = self.splittxt(bn.Description, tab)
                 items['txt'].append(dsp)
                 items['url'].append(base)
+                items['link'].append(link2)                
                 items['src'].append(base + "/@@images/" + fieldname + "/" + scale)        
             return items