bug fix for getActions() method: missing target parameter
git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@2605 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
		
							parent
							
								
									9b8b0096fd
								
							
						
					
					
						commit
						0a83e7a2d0
					
				
					 2 changed files with 9 additions and 8 deletions
				
			
		|  | @ -152,17 +152,17 @@ function validate() { | ||||||
|     if (titleField != undefined && titleField.value == '') { |     if (titleField != undefined && titleField.value == '') { | ||||||
|         return false; |         return false; | ||||||
|     } |     } | ||||||
|     /*if (form != undefined) { |     if (form != undefined) { | ||||||
|         return form.submit(); |         return form.submit(); | ||||||
|     }*/ |     } | ||||||
|     return true; |     return true; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| function closeDialog(save) { | function closeDialog(save) { | ||||||
|  |     closeDataWidget(save); | ||||||
|     if (save && !validate()) { |     if (save && !validate()) { | ||||||
|         return false; |         return false; | ||||||
|     } |     } | ||||||
|     closeDataWidget(save); |  | ||||||
|     dialog.hide(); |     dialog.hide(); | ||||||
|     return true; |     return true; | ||||||
| } | } | ||||||
|  | @ -173,7 +173,8 @@ function closeDataWidget(save) { | ||||||
|         value = widget.getValue(); |         value = widget.getValue(); | ||||||
|         //widget.close(save);
 |         //widget.close(save);
 | ||||||
|         form = dojo.byId('dialog_form'); |         form = dojo.byId('dialog_form'); | ||||||
|         var ta = document.createElement('textarea'); |         var ta = document.createElement('input'); | ||||||
|  |         ta.type = 'hidden'; | ||||||
|         ta.name = 'data'; |         ta.name = 'data'; | ||||||
|         ta.value = value; |         ta.value = value; | ||||||
|         form.appendChild(ta); |         form.appendChild(ta); | ||||||
|  |  | ||||||
|  | @ -44,7 +44,7 @@ class GlossaryView(ConceptView): | ||||||
|     def macro(self): |     def macro(self): | ||||||
|         return view_macros.macros['glossary'] |         return view_macros.macros['glossary'] | ||||||
| 
 | 
 | ||||||
|     def getActions(self, category='object', page=None): |     def getActions(self, category='object', page=None, target=None): | ||||||
|         actions = [] |         actions = [] | ||||||
|         if category == 'portlet': |         if category == 'portlet': | ||||||
|             actions.append(DialogAction(self, title='Create Glossary Item...', |             actions.append(DialogAction(self, title='Create Glossary Item...', | ||||||
|  | @ -55,7 +55,7 @@ class GlossaryView(ConceptView): | ||||||
|                   typeToken='.loops/concepts/glossaryitem', |                   typeToken='.loops/concepts/glossaryitem', | ||||||
|                   fixedType=True, |                   fixedType=True, | ||||||
|                   innerForm='inner_concept_form.html', |                   innerForm='inner_concept_form.html', | ||||||
|                   page=page)) |                   page=page, target=target)) | ||||||
|         return actions |         return actions | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  | @ -65,7 +65,7 @@ class GlossaryItemView(ConceptView): | ||||||
|     def macro(self): |     def macro(self): | ||||||
|         return view_macros.macros['glossaryitem'] |         return view_macros.macros['glossaryitem'] | ||||||
| 
 | 
 | ||||||
|     def getActions(self, category='object', page=None): |     def getActions(self, category='object', page=None, target=None): | ||||||
|         actions = [] |         actions = [] | ||||||
|         if category == 'portlet': |         if category == 'portlet': | ||||||
|             lang = self.request.get('loops.language') |             lang = self.request.get('loops.language') | ||||||
|  | @ -75,7 +75,7 @@ class GlossaryItemView(ConceptView): | ||||||
|                   viewName='edit_glossaryitem.html', |                   viewName='edit_glossaryitem.html', | ||||||
|                   dialogName='editGlossaryItem', |                   dialogName='editGlossaryItem', | ||||||
|                   addParams=langParam, |                   addParams=langParam, | ||||||
|                   page=page)) |                   page=page, target=target)) | ||||||
|         return actions |         return actions | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 helmutm
						helmutm