View | Details | Raw Unified | Return to bug 27037
Collapse All | Expand All

(-)univention-management-console-frontend/umc/about.js (-1 / +1 lines)
 Lines 49-55    Link Here 
49
			labelUMC_Version : this._( 'UMC version' ),
49
			labelUMC_Version : this._( 'UMC version' ),
50
			UMC_Version : info.umc_version,
50
			UMC_Version : info.umc_version,
51
			labelSSL_ValidityDate : this._( 'Validity date of the SSL certificate' ),
51
			labelSSL_ValidityDate : this._( 'Validity date of the SSL certificate' ),
52
			SSL_ValidityDate : info.ssl_validity_date
52
			SSL_ValidityDate : new Date(info.ssl_validity_date).toLocaleDateString()
53
		};
53
		};
54
		umc.dialog.templateDialog( "umc", "about.html", keys, this._( 'About UMC' ), this._( 'Close' ) );
54
		umc.dialog.templateDialog( "umc", "about.html", keys, this._( 'About UMC' ), this._( 'Close' ) );
55
	}
55
	}
(-)univention-management-console/src/univention/management/console/protocol/server.py (-3 / +1 lines)
 Lines 228-236    Link Here 
228
					response.result[ 'umc_version' ] = match.groups()[ 0 ]
228
					response.result[ 'umc_version' ] = match.groups()[ 0 ]
229
					response.result[ 'ucs_version' ] = '{0}-{1} errata{2} ({3})'.format( ucr.get( 'version/version', '' ), ucr.get( 'version/patchlevel', '' ), ucr.get( 'version/erratalevel', '0' ), ucr.get( 'version/releasename', '' ) )
229
					response.result[ 'ucs_version' ] = '{0}-{1} errata{2} ({3})'.format( ucr.get( 'version/version', '' ), ucr.get( 'version/patchlevel', '' ), ucr.get( 'version/erratalevel', '0' ), ucr.get( 'version/releasename', '' ) )
230
					response.result[ 'server' ] = '{0}.{1}'.format( ucr.get( 'hostname', '' ), ucr.get( 'domainname', '' ) )
230
					response.result[ 'server' ] = '{0}.{1}'.format( ucr.get( 'hostname', '' ), ucr.get( 'domainname', '' ) )
231
					import locale
231
					response.result[ 'ssl_validity_date' ] = int( ucr.get( 'ssl/validity/days', '0' ) ) * 24 * 60 * 60 * 1000
232
					locale.setlocale( locale.LC_ALL, 'de_DE.UTF-8' )
233
					response.result[ 'ssl_validity_date' ] = datetime.datetime.fromtimestamp( int( ucr.get( 'ssl/validity/days', '0' ) ) * 24 * 60 * 60 ).strftime( "%x" )
234
				except IOError:
232
				except IOError:
235
					response.status = BAD_REQUEST_FORBIDDEN
233
					response.status = BAD_REQUEST_FORBIDDEN
236
					pass
234
					pass

Return to bug 27037