wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8827 from owncloud/add-sqlite-info

Browse source 
add info about sqlite on setup page
This commit is contained in:
Thomas Müller 2014-06-03 15:07:59 +02:00
commit a5dd8e84f1
5 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/css/styles.css
View file

@ -558,7 +558,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
}
#body-login p.info{
#body-login footer .info {
white-space: nowrap;
}

5
core/js/setup.js
View file

@ -13,6 +13,8 @@ $(document).ready(function() {
if($('#hasSQLite').val()){
$('#use_other_db').hide();
$('#use_oracle_db').hide();
} else {
$('#sqliteInformation').hide();
}
$('#adminlogin').change(function(){
$('#adminlogin').val($.trim($('#adminlogin').val()));
@ -20,16 +22,19 @@ $(document).ready(function() {
$('#sqlite').click(function() {
$('#use_other_db').slideUp(250);
$('#use_oracle_db').slideUp(250);
$('#sqliteInformation').show();
});
$('#mysql,#pgsql,#mssql').click(function() {
$('#use_other_db').slideDown(250);
$('#use_oracle_db').slideUp(250);
$('#sqliteInformation').hide();
});
$('#oci').click(function() {
$('#use_other_db').slideDown(250);
$('#use_oracle_db').show(250);
$('#sqliteInformation').hide();
});
$('input[checked]').trigger('click');

6
core/templates/installation.php
View file

@ -91,7 +91,7 @@
<div id="selectDbType">
<?php foreach($_['databases'] as $type => $label): ?>
<?php if(count($_['databases']) === 1): ?>
<p class="info"><?php p($label . ' ' . $l->t( 'will be used' )); ?>.</p>
<p class="info"><?php p($l->t( 'Only %s is available.', array($label) )); ?>.</p>
<input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>" />
<?php else: ?>
<input type="radio" name="dbtype" value="<?php p($type) ?>" id="<?php p($type) ?>"
@ -112,7 +112,7 @@
autocomplete="off" autocapitalize="off" autocorrect="off" />
</p>
<p class="infield groupmiddle">
<input type="password" name="dbpass" id="dbpass" placeholder="" data-typetoggle="#dbpassword"
<input type="password" name="dbpass" id="dbpass" placeholder="" data-typetoggle="#dbpassword"
value="<?php p($_['dbpass']); ?>"
autocomplete="off" autocapitalize="off" autocorrect="off" />
<label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label>
@ -147,5 +147,7 @@
<?php endif; ?>
<?php endif; ?>
<p id="sqliteInformation" class="info"><?php p($l->t('SQLite will be used as database. For larger installations we recommend to change this.'));?></p>
<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>" /></div>
</form>

4
settings/admin.php
View file

@ -88,6 +88,10 @@ $tmpl->assign('forms', array());
foreach($forms as $form) {
$tmpl->append('forms', $form);
}
$databaseOverload = (strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false);
$tmpl->assign('databaseOverload', $databaseOverload);
$tmpl->printPage();
/**

14
settings/templates/admin.php
View file

@ -98,6 +98,20 @@ if (!$_['isAnnotationsWorking']) {
<?php
}
// SQLite database performance issue
if ($_['databaseOverload']) {
?>
<div class="section">
<h2><?php p($l->t('Database Performance Info'));?></h2>
<p class="securitywarning">
<?php p($l->t('SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: \'occ db:convert-type\'')); ?>
</p>
</div>
<?php
}
// if module fileinfo available?
if (!$_['has_fileinfo']) {
?>