work in progress: automatic setting of useful criteria for work item listings
git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3178 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
		
							parent
							
								
									24992512e6
								
							
						
					
					
						commit
						cf666c3bc3
					
				
					 1 changed files with 14 additions and 2 deletions
				
			
		|  | @ -219,9 +219,20 @@ class PersonWorkItems(BaseWorkItemsView, ConceptView): | ||||||
|     def macro(self): |     def macro(self): | ||||||
|         return self.work_macros['userworkitems'] |         return self.work_macros['userworkitems'] | ||||||
| 
 | 
 | ||||||
|  |     def getCriteria(self): | ||||||
|  |         crit = self.baseCriteria | ||||||
|  |         tft = crit.get('timeFromTo') or (None, None) | ||||||
|  |         if not tft[0]: | ||||||
|  |             tft = (getTimeStamp() - (3 * 24 * 3600), tft[1]) | ||||||
|  |             crit['timeFromTo'] = tft | ||||||
|  |         if not crit.get('state'): | ||||||
|  |             crit['state'] = ['planned', 'accepted', 'running', 'done', 'done_x', | ||||||
|  |                              'finished', 'delegated'] | ||||||
|  |         return crit | ||||||
|  | 
 | ||||||
|     @Lazy |     @Lazy | ||||||
|     def listWorkItems(self): |     def listWorkItems(self): | ||||||
|         criteria = self.baseCriteria |         criteria = self.getCriteria() | ||||||
|         for target in self.context.getParents([self.defaultPredicate]): |         for target in self.context.getParents([self.defaultPredicate]): | ||||||
|             un = criteria.setdefault('userName', []) |             un = criteria.setdefault('userName', []) | ||||||
|             un.append(util.getUidForObject(target)) |             un.append(util.getUidForObject(target)) | ||||||
|  | @ -359,7 +370,8 @@ class CreateWorkItem(EditObject, BaseTrackView): | ||||||
|         else: |         else: | ||||||
|             wi = workItems.add(util.getUidForObject(self.object), self.personId) |             wi = workItems.add(util.getUidForObject(self.object), self.personId) | ||||||
|         wi.doAction(action, self.personId, **data) |         wi.doAction(action, self.personId, **data) | ||||||
|         url = self.view.virtualTargetUrl + '?version=this' |         url = self.view.virtualTargetUrl | ||||||
|  |         #url = self.request.URL | ||||||
|         self.request.response.redirect(url) |         self.request.response.redirect(url) | ||||||
|         return False |         return False | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 helmutm
						helmutm