Merge lp:~unifield-team/unifield-web/remove-progressbar into lp:unifield-web

[Quentin THEURET @Amaris]

[lp:~unifield-team/unifield-web/remove-progressbar]

4586. By Quentin THEURET @Amaris on 2011-12-12

Change the keyword in condition to remove the progressbar

4587. By Quentin THEURET @Amaris on 2012-03-06

[MERGE] Merge lp:unifield-web

=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py	2012-02-20 09:55:45 +0000
+++ addons/openerp/widgets/listgrid.py	2012-03-06 08:57:20 +0000
@@ -630,6 +630,9 @@
         if not self.value:
             return 0.0
         
+        if self.value == "no-progressbar":
+            return "no-progressbar"
+        
         if isinstance(self.value, float):
             self.value = '%.2f' % (self.value)
             self.value = float(self.value)

=== modified file 'addons/openerp/widgets/templates/listgrid/progressbar.mako'
--- addons/openerp/widgets/templates/listgrid/progressbar.mako	2010-12-02 13:30:21 +0000
+++ addons/openerp/widgets/templates/listgrid/progressbar.mako	2012-03-06 08:57:20 +0000
@@ -1,4 +1,6 @@
+% if text != "no-progressbar":
 <div style="position: relative; border: 1px solid gray; font-size: 11px;">&nbsp;
     <div style="position: absolute; top:0; left: 0; background: #afafaf; width: ${range}%; height: 100%;"></div>
     <div style="position: absolute; top:0; left: 0; width: 100%; height: 100%; text-align: center">${text}%</div>
 </div>
+% endif
\ No newline at end of file