diff options
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/application.php | 1 | ||||
| -rw-r--r-- | settings/controller/checksetupcontroller.php | 7 | ||||
| -rw-r--r-- | settings/js/personal.js | 9 |
3 files changed, 8 insertions, 9 deletions
diff --git a/settings/application.php b/settings/application.php index b4596037964..eb8f0f7a999 100644 --- a/settings/application.php +++ b/settings/application.php @@ -124,6 +124,7 @@ class Application extends App { $c->query('Request'), $c->query('Config'), $c->query('ClientService'), + $c->query('URLGenerator'), $c->query('Util') ); }); diff --git a/settings/controller/checksetupcontroller.php b/settings/controller/checksetupcontroller.php index ae3f1b99c52..15719ce215f 100644 --- a/settings/controller/checksetupcontroller.php +++ b/settings/controller/checksetupcontroller.php @@ -27,6 +27,7 @@ use OCP\Http\Client\IClientService; use OCP\IConfig; use OCP\IRequest; use OC_Util; +use OCP\IURLGenerator; /** * @package OC\Settings\Controller @@ -38,23 +39,28 @@ class CheckSetupController extends Controller { private $clientService; /** @var \OC_Util */ private $util; + /** @var IURLGenerator */ + private $urlGenerator; /** * @param string $AppName * @param IRequest $request * @param IConfig $config * @param IClientService $clientService + * @param IURLGenerator $urlGenerator * @param \OC_Util $util */ public function __construct($AppName, IRequest $request, IConfig $config, IClientService $clientService, + IURLGenerator $urlGenerator, \OC_Util $util) { parent::__construct($AppName, $request); $this->config = $config; $this->clientService = $clientService; $this->util = $util; + $this->urlGenerator = $urlGenerator; } /** @@ -93,6 +99,7 @@ class CheckSetupController extends Controller { 'serverHasInternetConnection' => $this->isInternetConnectionWorking(), 'dataDirectoryProtected' => $this->util->isHtaccessWorking($this->config), 'isMemcacheConfigured' => $this->isMemcacheConfigured(), + 'memcacheDocs' => $this->urlGenerator->linkToDocs('admin-performance'), ] ); } diff --git a/settings/js/personal.js b/settings/js/personal.js index 30d7f5e9388..b269ebae3bc 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -335,10 +335,6 @@ $(document).ready(function () { cert: row.data('name') }); row.remove(); - - if ($('#sslCertificate > tbody > tr').length === 0) { - $('#sslCertificate').hide(); - } return true; }); @@ -366,17 +362,12 @@ $(document).ready(function () { )); $('#sslCertificate tbody').append(row); - $('#sslCertificate').show(); } }); $('#rootcert_import_button').click(function () { $('#rootcert_import').click(); }); - - if ($('#sslCertificate > tbody > tr').length === 0) { - $('#sslCertificate').hide(); - } }); OC.Encryption = { |