Merge pull request #1996 from jberry-suse/origin-manager-web-multilevel-domain

web/origin-manager: handle multi-level domains.
This commit is contained in:
Jimmy Berry 2019-05-10 11:35:13 -05:00 committed by GitHub
commit a18d69a6e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -9,7 +9,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-sparklines/2.1.2/jquery.sparkline.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.4.0/bootbox.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/tabulator/4.2.3/js/tabulator.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/diff2html/2.7.0/diff2html.js"></script>

View File

@ -1,10 +1,10 @@
function operator_url() {
var domain_parent = window.location.hostname.split('.').splice(1).join('.');
var domain_parent = window.location.hostname.split('.').splice(-2).join('.');
var subdomain = domain_parent.endsWith('suse.de') ? 'tortuga' : 'operator';
return 'https://' + subdomain + '.' + domain_parent;
}
function obs_url() {
var domain_parent = window.location.hostname.split('.').splice(1).join('.');
var domain_parent = window.location.hostname.split('.').splice(-2).join('.');
return 'https://build.' + domain_parent;
}