Attachment 5317 Details for Bug 31923

[patch] patch for frontend uploader and UDM license upload

modules.patch (text/plain), 1.59 KB, created by Florian Best on 2013-07-10 16:58 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2013-07-10 16:58 CEST

Size: 1.59 KB

patch

obsolete

>Index: univention-management-console-module-udm/umc/python/udm/__init__.py
>===================================================================
>--- univention-management-console-module-udm/umc/python/udm/__init__.py	(Revision 42188)
>+++ univention-management-console-module-udm/umc/python/udm/__init__.py	(Arbeitskopie)
>@@ -223,13 +223,9 @@
> 
> 	@LDAP_Connection
> 	def license_import( self, request, ldap_connection = None, ldap_position = None ):
>-		filename = None
>-		if isinstance(request.options, (list, tuple)) and request.options:
>-			# file upload
>-			filename = request.options[ 0 ][ 'tmpfile' ]
>-			if not os.path.realpath(filename).startswith(TEMPUPLOADDIR):
>-				self.finished(request.id, [{'success': False, 'message': 'invalid file path'}])
>-				return
>+		if request.command == 'UPLOAD':
>+			self.required_options(request, 'licenseUpload')
>+			filename = request.options['licenseUpload']['tmpfile']
> 		else:
> 			self.required_options( request, 'license' )
> 			lic = request.options[ 'license' ]
>Index: univention-management-console-frontend/umc/widgets/Uploader.js
>===================================================================
>--- univention-management-console-frontend/umc/widgets/Uploader.js	(Revision 42188)
>+++ univention-management-console-frontend/umc/widgets/Uploader.js	(Arbeitskopie)
>@@ -125,6 +125,7 @@
> 			this._uploader = new dojox.form.Uploader({
> 				url: '/umcp/upload' + (this.command ? '/' + this.command : ''),
> 				label: this.buttonLabel,
>+				name: this.name,
> 				getForm: function() {
> 					// make sure that the Uploader does not find any of our encapsulating forms
> 					return null;

Actions: View | Diff

Attachments on bug 31923: 5316 | 5317