diff options
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/admin.php | 8 | ||||
| -rw-r--r-- | settings/js/settings.js | 28 | ||||
| -rw-r--r-- | settings/l10n/sr@latin.js | 1 | ||||
| -rw-r--r-- | settings/l10n/sr@latin.json | 1 | ||||
| -rw-r--r-- | settings/templates/admin.php | 4 |
5 files changed, 20 insertions, 22 deletions
diff --git a/settings/admin.php b/settings/admin.php index 56484f25b26..e8b1fef7b7a 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -56,11 +56,11 @@ $template->assign('forceSSLforSubdomainsEnabled', $config->getSystemValue('force // If the current web root is non-empty but the web root from the config is, // and system cron is used, the URL generator fails to build valid URLs. -$shouldSuggestOverwriteWebRoot = $config->getAppValue('core', 'backgroundjobs_mode', 'ajax') === 'cron' && +$shouldSuggestOverwriteCliUrl = $config->getAppValue('core', 'backgroundjobs_mode', 'ajax') === 'cron' && \OC::$WEBROOT && \OC::$WEBROOT !== '/' && - !$config->getSystemValue('overwritewebroot', ''); -$suggestedOverwriteWebRoot = ($shouldSuggestOverwriteWebRoot) ? \OC::$WEBROOT : ''; -$template->assign('suggestedOverwriteWebroot', $suggestedOverwriteWebRoot); + !$config->getSystemValue('overwrite.cli.url', ''); +$suggestedOverwriteCliUrl = ($shouldSuggestOverwriteCliUrl) ? \OC::$WEBROOT : ''; +$template->assign('suggestedOverwriteCliUrl', $suggestedOverwriteCliUrl); $template->assign('allowLinks', $appConfig->getValue('core', 'shareapi_allow_links', 'yes')); $template->assign('enforceLinkPassword', \OCP\Util::isPublicLinkPasswordRequired()); diff --git a/settings/js/settings.js b/settings/js/settings.js index e98bd2cc895..fcbe328b76f 100644 --- a/settings/js/settings.js +++ b/settings/js/settings.js @@ -45,25 +45,21 @@ OC.Settings = _.extend(OC.Settings, { data: queryData, dataType: 'json', success: function(data) { - if (data.status === "success") { - var results = []; + var results = []; - // add groups - $.each(data.data.adminGroups, function(i, group) { - results.push({id:group.id, displayname:group.name}); - }); - $.each(data.data.groups, function(i, group) { - results.push({id:group.id, displayname:group.name}); - }); + // add groups + $.each(data.data.adminGroups, function(i, group) { + results.push({id:group.id, displayname:group.name}); + }); + $.each(data.data.groups, function(i, group) { + results.push({id:group.id, displayname:group.name}); + }); - if (query.term === '') { - // cache full list - self._cachedGroups = results; - } - query.callback({results: results}); - } else { - //FIXME add error handling + if (query.term === '') { + // cache full list + self._cachedGroups = results; } + query.callback({results: results}); } }); }, 100, true), diff --git a/settings/l10n/sr@latin.js b/settings/l10n/sr@latin.js index aae711e987e..19ed79764db 100644 --- a/settings/l10n/sr@latin.js +++ b/settings/l10n/sr@latin.js @@ -13,6 +13,7 @@ OC.L10N.register( "Strong password" : "Jaka lozinka", "Delete" : "Obriši", "Groups" : "Grupe", + "never" : "nikad", "Security Warning" : "Bezbednosno upozorenje", "Port" : "Port", "by" : "od", diff --git a/settings/l10n/sr@latin.json b/settings/l10n/sr@latin.json index 16be7389679..2fc6fe4ca07 100644 --- a/settings/l10n/sr@latin.json +++ b/settings/l10n/sr@latin.json @@ -11,6 +11,7 @@ "Strong password" : "Jaka lozinka", "Delete" : "Obriši", "Groups" : "Grupe", + "never" : "nikad", "Security Warning" : "Bezbednosno upozorenje", "Port" : "Port", "by" : "od", diff --git a/settings/templates/admin.php b/settings/templates/admin.php index d04351c2d6c..f55626defb0 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -178,13 +178,13 @@ if (!$_['isLocaleWorking']) { <?php } -if ($_['suggestedOverwriteWebroot']) { +if ($_['suggestedOverwriteCliUrl']) { ?> <div class="section"> <h2><?php p($l->t('URL generation in notification emails'));?></h2> <span class="connectionwarning"> - <?php p($l->t('If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the "overwritewebroot" option in your config.php file to the webroot path of your installation (Suggested: "%s")', $_['suggestedOverwriteWebroot'])); ?> + <?php p($l->t('If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the "overwrite.cli.url" option in your config.php file to the webroot path of your installation (Suggested: "%s")', $_['suggestedOverwriteCliUrl'])); ?> </span> </div> |