Merge pull request #5290 from owncloud/fixing-5191-master

Installation. Show advanced section on error. Fixes #5191

2 files changed, 16 insertions, 19 deletions

diff --git a/core/js/setup.js b/core/js/setup.js
index 62f313fc501..0863be35886 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -9,8 +9,7 @@ $(document).ready(function() {
 	};
 	
 	$('#selectDbType').buttonset();
-	$('#datadirContent').hide(250);
-	$('#databaseField').hide(250);
+	
 	if($('#hasSQLite').val()){
 		$('#use_other_db').hide();
 		$('#use_oracle_db').hide();
@@ -23,12 +22,7 @@ $(document).ready(function() {
 		$('#use_oracle_db').slideUp(250);
 	});
 
-	$('#mysql').click(function() {
-		$('#use_other_db').slideDown(250);
-		$('#use_oracle_db').slideUp(250);
-	});
-
-	$('#pgsql').click(function() {
+	$('#mysql,#pgsql,#mssql').click(function() {
 		$('#use_other_db').slideDown(250);
 		$('#use_oracle_db').slideUp(250);
 	});
@@ -38,11 +32,6 @@ $(document).ready(function() {
 		$('#use_oracle_db').show(250);
 	});
 
-	$('#mssql').click(function() {
-		$('#use_other_db').slideDown(250);
-		$('#use_oracle_db').slideUp(250);
-	});
-
 	$('input[checked]').trigger('click');
 
 	$('#showAdvanced').click(function() {
@@ -74,9 +63,17 @@ $(document).ready(function() {
 		form.submit();
 		return false;
 	});
-
-	if(!dbtypes.sqlite){
-		$('#showAdvanced').click();
+	
+	// Expand latest db settings if page was reloaded on error
+	var currentDbType = $('input[type="radio"]:checked').val();
+	
+	if (currentDbType === undefined){
 		$('input[type="radio"]').first().click();
 	}
+	
+	if (currentDbType === 'sqlite' || (dbtypes.sqlite && currentDbType === undefined)){
+		$('#datadirContent').hide(250);
+		$('#databaseField').hide(250);
+	}
+	
 });
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 5a103762269..a6f55cb0e28 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -61,13 +61,13 @@
 		</p>
 	</fieldset>
 
-	<?php if(!$_['directoryIsSet'] OR !$_['dbIsSet']): ?>
+	<?php if(!$_['directoryIsSet'] OR !$_['dbIsSet'] OR count($_['errors']) > 0): ?>
 	<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>
 	</fieldset>
 	<?php endif; ?>
 
-	<?php if(!$_['directoryIsSet']): ?>
+	<?php if(!$_['directoryIsSet'] OR count($_['errors']) > 0): ?>
 	<fieldset id="datadirField">
 		<div id="datadirContent">
 			<label for="directory"><?php p($l->t( 'Data folder' )); ?></label>
@@ -78,7 +78,7 @@
 	</fieldset>
 	<?php endif; ?>
 
-	<?php if(!$_['dbIsSet']): ?>
+	<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
 	<fieldset id='databaseField'>
 		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL'])
 			$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>