Skip to content
This repository has been archived by the owner on Oct 5, 2021. It is now read-only.

Commit

Permalink
Merge pull request #392 from apremalal/master
Browse files Browse the repository at this point in the history 
fixing database creation advanced option issue
  • Loading branch information
Anuruddha committed Jul 29, 2015
2 parents 9ffd587 + 112b4d4 commit ee146f9
Showing 1 changed file with 30 additions and 29 deletions.
59 changes: 30 additions & 29 deletions ...jaggery-apps/appmgt/src/site/themes/default/templates/resources/database/add/template.jag
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,17 +217,6 @@ jagg.template("resources/database/add", function (inputs, outputs, jagg) { %>
return;
}

$("#js_db_user").on("change", "select2-selecting", function(e) {
if((e.val == 'create_new_user') && $(this).next(".extra_fields_box").css("display") == "none"){
$(this).next(".extra_fields_box").slideToggle(250);
} else {
if($(this).next(".extra_fields_box").css("display") == "block") {
$(this).next(".extra_fields_box").slideToggle(250);
}
}
});


},
function (jqXHR, textStatus, errorThrown) {
if ( jqXHR.status != 0){
Expand All @@ -237,6 +226,17 @@ jagg.template("resources/database/add", function (inputs, outputs, jagg) { %>

}


function handleCreateUserChange(){
if(($("#js_db_user").val() == 'create_new_user') && $("#js_db_user").next(".extra_fields_box").css("display") == "none"){
$("#js_db_user").next(".extra_fields_box").slideToggle(250);
} else {
if($("#js_db_user").next(".extra_fields_box").css("display") == "block") {
$("#js_db_user").next(".extra_fields_box").slideToggle(250);
}
}
}

function loadTemplatesForSelectedStage(selectionValue){
jagg.post("../blocks/resources/database/templates/ajax/list.jag", {
action:"getAvailableTemplatesToAttachToDatabase",
Expand Down Expand Up @@ -268,18 +268,6 @@ jagg.template("resources/database/add", function (inputs, outputs, jagg) { %>
return;
}

$("#js_db_template").on("change", "select2-selecting", function(e) {
if((e.val == 'create_new_template') && $(this).next(".extra_fields_box").css("display") == "none"){
$(this).next(".extra_fields_box").slideToggle(250);
} else {
if($(this).next(".extra_fields_box").css("display") == "block") {
$(this).next(".extra_fields_box").slideToggle(250);
}
}


});

},
function (jqXHR, textStatus, errorThrown) {

Expand All @@ -290,6 +278,16 @@ jagg.template("resources/database/add", function (inputs, outputs, jagg) { %>
});
}

function handlePermissoinTemplateSelectChange(){
if(($("#js_db_template").val() == 'create_new_template') && $("#js_db_template").next(".extra_fields_box").css("display") == "none"){
$("#js_db_template").next(".extra_fields_box").slideToggle(250);
} else {
if($("#js_db_template").next(".extra_fields_box").css("display") == "block") {
$("#js_db_template").next(".extra_fields_box").slideToggle(250);
}
}
}

function createDatabase(btn){
var isBasicDbCreation = true;
var createDatasource = false;
Expand Down Expand Up @@ -947,6 +945,7 @@ jagg.template("resources/database/add", function (inputs, outputs, jagg) { %>
}

$(document).ready(function(){
$("#js_extra_fieldset_on").next().next().slideUp('fast')
$('.js_cancel_user').click(function(){
$('#js_db_user').next().hide();
$('#js_db_user').select2('val','choose_user');
Expand Down Expand Up @@ -1110,17 +1109,18 @@ jagg.template("resources/database/add", function (inputs, outputs, jagg) { %>
<fieldset class="push_top_10">

<legend id="js_extra_fieldset_on" data-down="hidden">

<input type="checkbox" name="advanced_options" align="left" id="advancecheckbox"> Advanced Options
</legend>

<div id="createAdvancedHelp" style="margin-left:220px;font-size:13px;color:#777;"></div>

<div class="extra_fieldset hide">
<div class="extra_fieldset">
<!-- user -->
<div class="input_row">
<label for="db_user" ><strong>User</strong> <em>*</em></label>
<select class="select_list half big" id="js_db_user" name="db_user"></select>
<select class="select_list half big" onchange="handleCreateUserChange();return false;" id="js_db_user" name="db_user"></select>

<div class="extra_fields_box hide" >
<div class="extra_fields_box " >
<div class="extra_fields">

<div class="extra_field_row">
Expand Down Expand Up @@ -1153,11 +1153,12 @@ jagg.template("resources/database/add", function (inputs, outputs, jagg) { %>
</div>
</div>
</div>
<!-- permission template -->
<div class="input_row">
<label for="db_template" ><strong>Permission Template</strong> <em>*</em></label>
<select id='js_db_template' class="select_list half big" name="db_template">
<select id='js_db_template' class="select_list half big" name="db_template" onchange="handlePermissoinTemplateSelectChange(); return false;">
</select>
<div class="extra_fields_box hide" >
<div class="extra_fields_box" >
<div class="extra_fields">

<div class="extra_field_row">
Expand Down

0 comments on commit ee146f9

Please sign in to comment.