Merge pull request #5290 from owncloud/fixing-5191-master
Installation. Show advanced section on error. Fixes #5191
This commit is contained in:
commit
e6d034a60b
|
@ -9,8 +9,7 @@ $(document).ready(function() {
|
||||||
};
|
};
|
||||||
|
|
||||||
$('#selectDbType').buttonset();
|
$('#selectDbType').buttonset();
|
||||||
$('#datadirContent').hide(250);
|
|
||||||
$('#databaseField').hide(250);
|
|
||||||
if($('#hasSQLite').val()){
|
if($('#hasSQLite').val()){
|
||||||
$('#use_other_db').hide();
|
$('#use_other_db').hide();
|
||||||
$('#use_oracle_db').hide();
|
$('#use_oracle_db').hide();
|
||||||
|
@ -23,12 +22,7 @@ $(document).ready(function() {
|
||||||
$('#use_oracle_db').slideUp(250);
|
$('#use_oracle_db').slideUp(250);
|
||||||
});
|
});
|
||||||
|
|
||||||
$('#mysql').click(function() {
|
$('#mysql,#pgsql,#mssql').click(function() {
|
||||||
$('#use_other_db').slideDown(250);
|
|
||||||
$('#use_oracle_db').slideUp(250);
|
|
||||||
});
|
|
||||||
|
|
||||||
$('#pgsql').click(function() {
|
|
||||||
$('#use_other_db').slideDown(250);
|
$('#use_other_db').slideDown(250);
|
||||||
$('#use_oracle_db').slideUp(250);
|
$('#use_oracle_db').slideUp(250);
|
||||||
});
|
});
|
||||||
|
@ -38,11 +32,6 @@ $(document).ready(function() {
|
||||||
$('#use_oracle_db').show(250);
|
$('#use_oracle_db').show(250);
|
||||||
});
|
});
|
||||||
|
|
||||||
$('#mssql').click(function() {
|
|
||||||
$('#use_other_db').slideDown(250);
|
|
||||||
$('#use_oracle_db').slideUp(250);
|
|
||||||
});
|
|
||||||
|
|
||||||
$('input[checked]').trigger('click');
|
$('input[checked]').trigger('click');
|
||||||
|
|
||||||
$('#showAdvanced').click(function() {
|
$('#showAdvanced').click(function() {
|
||||||
|
@ -75,8 +64,16 @@ $(document).ready(function() {
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
if(!dbtypes.sqlite){
|
// Expand latest db settings if page was reloaded on error
|
||||||
$('#showAdvanced').click();
|
var currentDbType = $('input[type="radio"]:checked').val();
|
||||||
|
|
||||||
|
if (currentDbType === undefined){
|
||||||
$('input[type="radio"]').first().click();
|
$('input[type="radio"]').first().click();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (currentDbType === 'sqlite' || (dbtypes.sqlite && currentDbType === undefined)){
|
||||||
|
$('#datadirContent').hide(250);
|
||||||
|
$('#databaseField').hide(250);
|
||||||
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -61,13 +61,13 @@
|
||||||
</p>
|
</p>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
<?php if(!$_['directoryIsSet'] OR !$_['dbIsSet']): ?>
|
<?php if(!$_['directoryIsSet'] OR !$_['dbIsSet'] OR count($_['errors']) > 0): ?>
|
||||||
<fieldset id="advancedHeader">
|
<fieldset id="advancedHeader">
|
||||||
<legend><a id="showAdvanced"><?php p($l->t( 'Advanced' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend>
|
<legend><a id="showAdvanced"><?php p($l->t( 'Advanced' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
|
||||||
<?php if(!$_['directoryIsSet']): ?>
|
<?php if(!$_['directoryIsSet'] OR count($_['errors']) > 0): ?>
|
||||||
<fieldset id="datadirField">
|
<fieldset id="datadirField">
|
||||||
<div id="datadirContent">
|
<div id="datadirContent">
|
||||||
<label for="directory"><?php p($l->t( 'Data folder' )); ?></label>
|
<label for="directory"><?php p($l->t( 'Data folder' )); ?></label>
|
||||||
|
@ -78,7 +78,7 @@
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
|
||||||
<?php if(!$_['dbIsSet']): ?>
|
<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
|
||||||
<fieldset id='databaseField'>
|
<fieldset id='databaseField'>
|
||||||
<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL'])
|
<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL'])
|
||||||
$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
|
$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
|
||||||
|
|
Loading…
Reference in New Issue