Univention Bugzilla – Attachment 6664 Details for
Bug 35456
ini should support WebInterfacePort
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
webinterfaceport.patch (text/plain), 1.60 KB, created by
Florian Best
on 2015-02-11 13:21 CET
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Florian Best
Created:
2015-02-11 13:21 CET
Size:
1.60 KB
patch
obsolete
>diff --git a/ucs-4.0-1/management/univention-management-console-module-appcenter/umc/js/appcenter/AppInstallationsItem.js b/ucs-4.0-1/management/univention-management-console-module-appcenter/umc/js/appcenter/AppInstallationsItem.js >index 524ec9d..8f01538 100644 >--- a/ucs-4.0-1/management/univention-management-console-module-appcenter/umc/js/appcenter/AppInstallationsItem.js >+++ b/ucs-4.0-1/management/univention-management-console-module-appcenter/umc/js/appcenter/AppInstallationsItem.js >@@ -142,7 +142,7 @@ define([ > } > if (this.webInterface) { > var url = this.webInterface; >- if (this.webInterface[0] == '/' && !this.isLocal()) { >+ if (/^(:\d+)?\//.test(url) && !this.isLocal()) { > url = lang.replace('{protocol}//{host}{webInterface}', { > protocol: window.location.protocol, > host: host, >diff --git a/ucs-4.0-1/services/univention-apache/js/ucs/startsite.js b/ucs-4.0-1/services/univention-apache/js/ucs/startsite.js >index a1f339c..c94b487 100644 >--- a/ucs-4.0-1/services/univention-apache/js/ucs/startsite.js >+++ b/ucs-4.0-1/services/univention-apache/js/ucs/startsite.js >@@ -209,6 +209,9 @@ define([ > array.forEach(['link', 'icon', 'label', 'description'], lang.hitch(this, function(ikey) { > localizedProps[ikey] = this._localizeString(props[ikey]); > })); >+ if (/^:\d+\//.test(localizedProps.link)) { >+ localizedProps.link = window.location.protocol + '//' + window.location.hostname + localizedProps.link; >+ } > var node = domConstruct.toDom(lang.replace( > '<div class="umcGalleryWrapperItem col-xxs-12 col-xs-6 col-sm-6 col-md-4" id="{id}">\n' > + ' <a href="{link}">\n'
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
Actions:
View
|
Diff
Attachments on
bug 35456
: 6664