Merge branch 'bbmaster' of ssh://git.cy55.de/home/git/loops into bbmaster
This commit is contained in:
		
						commit
						f682db7811
					
				
					 2 changed files with 20 additions and 1 deletions
				
			
		|  | @ -39,6 +39,25 @@ class TextField(Field): | ||||||
|         return row.parent.context.view.renderText(value, self.format) |         return row.parent.context.view.renderText(value, self.format) | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  | class DecimalField(Field): | ||||||
|  | 
 | ||||||
|  |     format = '###,###,##0.##' | ||||||
|  | 
 | ||||||
|  |     def getDisplayValue(self, row): | ||||||
|  |         value = self.getRawValue(row) | ||||||
|  |         if not value: | ||||||
|  |             return u'' | ||||||
|  |         if not isinstance(value, float): | ||||||
|  |             value = float(value) | ||||||
|  |         nv = row.parent.context.view.nodeView | ||||||
|  |         langInfo = nv and getattr(nv, 'languageInfo', None) or None | ||||||
|  |         if langInfo: | ||||||
|  |             locale = locales.getLocale(langInfo.language) | ||||||
|  |             fmt = locale.numbers.getFormatter('decimal') | ||||||
|  |             return fmt.format(value) | ||||||
|  |         return '%.2f' % value | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
| class DateField(Field): | class DateField(Field): | ||||||
| 
 | 
 | ||||||
|     format = ('date', 'short') |     format = ('date', 'short') | ||||||
|  |  | ||||||
|  | @ -49,7 +49,7 @@ class BaseTrackView(TrackView): | ||||||
|         task = self.task |         task = self.task | ||||||
|         if task is None: |         if task is None: | ||||||
|             return self.metadata['taskId'] |             return self.metadata['taskId'] | ||||||
|         return getattr(task, 'title', getName(task)) |         return getattr(task, 'title', None) or getName(task) | ||||||
| 
 | 
 | ||||||
|     @Lazy |     @Lazy | ||||||
|     def taskUrl(self): |     def taskUrl(self): | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 hplattner
						hplattner