Commit 49eef20c authored by jan.koester's avatar jan.koester
Browse files

domain id changeable

parent 97c0244d

data/admin.html

+10 −0
Changes for data/admin.html: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -327,11 +327,20 @@ function loadDomains() { 
    });

}



function generateUUID() {

    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {

        var r = Math.random() * 16 | 0, v = c === 'x' ? r : (r & 0x3 | 0x8);

        return v.toString(16);

    });

}



function createDomainForm() {

    var isCluster = (g_backendType === 2);

    var suggestedId = generateUUID();

    var html = '<h3>Create Domain</h3>';

    html += '<form id="createdomainform" class="admin-form">';

    html += '<table>';

    html += '<tr><td><label>Domain ID:</label></td><td><input type="text" id="cd_id" class="domaintext" value="' + suggestedId + '"></td></tr>';

    html += '<tr><td><label>Domain Name:</label></td><td><input type="text" id="cd_name" class="domaintext" value=""></td></tr>';

    if (isCluster) {

        html += '<input type="hidden" id="cd_storage" value="2">';
@@ -349,6 +358,7 @@ function createDomainForm() { 
function submitCreateDomain() {

    var optEl = document.getElementById("cd_options");

    var obj = {

        domainid: document.getElementById("cd_id").value.trim(),

        domainname: document.getElementById("cd_name").value,

        domainstorage: parseInt(document.getElementById("cd_storage").value),

        domainoptions: optEl ? optEl.value : ""

src/admin.cpp

+5 −0
Changes for src/admin.cpp: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -719,7 +719,12 @@ namespace authdb { 
            }



            uuid::uuid uid;

            json_object *jid = json_object_object_get(jreq, "domainid");

            if (jid && strlen(json_object_get_string(jid)) > 0) {

                uid = uuid::uuid(json_object_get_string(jid));

            } else {

                uid.generate();

            }

            class DomainData ddat(uid);



            // domainname