tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git.icinga.org:icingaweb2

This commit is contained in:
Alexander Fuhr 2015-04-30 16:19:02 +02:00
parent 15b86e5be7 034421d0cb
commit 32f657bc01
7 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/forms/Config/AuthenticationBackendReorderForm.php
View File

@ -51,7 +51,7 @@ class AuthenticationBackendReorderForm extends ConfigForm
try { try {
if ($configForm->move($backendName, $position)->save()) { if ($configForm->move($backendName, $position)->save()) {
Notification::success($this->translate('Authentication order updated!')); Notification::success($this->translate('Authentication order updated'));
} else { } else {
return false; return false;
} }

4
application/locale/it_IT/LC_MESSAGES/icinga.po
View File

@ -199,8 +199,8 @@ msgid "Authentication backend name missing"
msgstr "Nome del Backend di autenticazione non specificato" msgstr "Nome del Backend di autenticazione non specificato"
#: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendReorderForm.php:54 #: /usr/share/icingaweb2/application/forms/Config/AuthenticationBackendReorderForm.php:54
msgid "Authentication order updated!" msgid "Authentication order updated"
msgstr "Ordine di autenticazione aggiornato!" msgstr "Ordine di autenticazione aggiornato"
#: /usr/share/icingaweb2/application/forms/AutoRefreshForm.php:44 #: /usr/share/icingaweb2/application/forms/AutoRefreshForm.php:44
msgid "Auto refresh successfully disabled" msgid "Auto refresh successfully disabled"

4
application/locale/pt_BR/LC_MESSAGES/icinga.po
View File

@ -130,8 +130,8 @@ msgid "Authentication backend name missing"
msgstr "Falta o nome do backend de autenticação" msgstr "Falta o nome do backend de autenticação"
#: /usr/local/icingaweb/application/forms/Config/AuthenticationBackendReorderForm.php:55 #: /usr/local/icingaweb/application/forms/Config/AuthenticationBackendReorderForm.php:55
msgid "Authentication order updated!" msgid "Authentication order updated"
msgstr "Ordem da autenticação atualizada!" msgstr "Ordem da autenticação atualizada"
#: /usr/local/icingaweb/application/forms/Config/AuthenticationBackendConfigForm.php:307 #: /usr/local/icingaweb/application/forms/Config/AuthenticationBackendConfigForm.php:307
msgid "Autologin" msgid "Autologin"

1
modules/monitoring/public/css/module.less
View File

@ -32,7 +32,6 @@ p.pluginoutput {
} }
div.pluginoutput { div.pluginoutput {
border-right: solid 5px @colorPetrol;
overflow: auto; overflow: auto;
color: black; color: black;
margin-bottom: 1em; margin-bottom: 1em;

6
test/php/application/forms/Config/Authentication/DbBackendFormTest.php
View File

@ -31,7 +31,8 @@ class DbBackendFormTest extends BaseTestCase
->shouldReceive('count') ->shouldReceive('count')
->andReturn(2); ->andReturn(2);
$form = Mockery::mock('Icinga\Forms\Config\Authentication\DbBackendForm[getView]'); // Passing array(null) is required to make Mockery call the constructor...
$form = Mockery::mock('Icinga\Forms\Config\Authentication\DbBackendForm[getView]', array(null));
$form->shouldReceive('getView->escape') $form->shouldReceive('getView->escape')
->with(Mockery::type('string')) ->with(Mockery::type('string'))
->andReturnUsing(function ($s) { return $s; }); ->andReturnUsing(function ($s) { return $s; });
@ -56,7 +57,8 @@ class DbBackendFormTest extends BaseTestCase
->shouldReceive('count') ->shouldReceive('count')
->andReturn(0); ->andReturn(0);
$form = Mockery::mock('Icinga\Forms\Config\Authentication\DbBackendForm[getView]'); // Passing array(null) is required to make Mockery call the constructor...
$form = Mockery::mock('Icinga\Forms\Config\Authentication\DbBackendForm[getView]', array(null));
$form->shouldReceive('getView->escape') $form->shouldReceive('getView->escape')
->with(Mockery::type('string')) ->with(Mockery::type('string'))
->andReturnUsing(function ($s) { return $s; }); ->andReturnUsing(function ($s) { return $s; });

6
test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
View File

@ -31,7 +31,8 @@ class LdapBackendFormTest extends BaseTestCase
Mockery::mock('overload:Icinga\Authentication\Backend\LdapUserBackend') Mockery::mock('overload:Icinga\Authentication\Backend\LdapUserBackend')
->shouldReceive('assertAuthenticationPossible')->andReturnNull(); ->shouldReceive('assertAuthenticationPossible')->andReturnNull();
$form = Mockery::mock('Icinga\Forms\Config\Authentication\LdapBackendForm[getView]'); // Passing array(null) is required to make Mockery call the constructor...
$form = Mockery::mock('Icinga\Forms\Config\Authentication\LdapBackendForm[getView]', array(null));
$form->shouldReceive('getView->escape') $form->shouldReceive('getView->escape')
->with(Mockery::type('string')) ->with(Mockery::type('string'))
->andReturnUsing(function ($s) { return $s; }); ->andReturnUsing(function ($s) { return $s; });
@ -55,7 +56,8 @@ class LdapBackendFormTest extends BaseTestCase
Mockery::mock('overload:Icinga\Authentication\Backend\LdapUserBackend') Mockery::mock('overload:Icinga\Authentication\Backend\LdapUserBackend')
->shouldReceive('assertAuthenticationPossible')->andThrow(new AuthenticationException); ->shouldReceive('assertAuthenticationPossible')->andThrow(new AuthenticationException);
$form = Mockery::mock('Icinga\Forms\Config\Authentication\LdapBackendForm[getView]'); // Passing array(null) is required to make Mockery call the constructor...
$form = Mockery::mock('Icinga\Forms\Config\Authentication\LdapBackendForm[getView]', array(null));
$form->shouldReceive('getView->escape') $form->shouldReceive('getView->escape')
->with(Mockery::type('string')) ->with(Mockery::type('string'))
->andReturnUsing(function ($s) { return $s; }); ->andReturnUsing(function ($s) { return $s; });

6
test/php/application/forms/Config/Resource/LdapResourceFormTest.php
View File

@ -29,7 +29,8 @@ class LdapResourceFormTest extends BaseTestCase
Mockery::mock()->shouldReceive('testCredentials')->once()->andReturn(true)->getMock() Mockery::mock()->shouldReceive('testCredentials')->once()->andReturn(true)->getMock()
); );
$form = Mockery::mock('Icinga\Forms\Config\Resource\LdapResourceForm[getView]'); // Passing array(null) is required to make Mockery call the constructor...
$form = Mockery::mock('Icinga\Forms\Config\Resource\LdapResourceForm[getView]', array(null));
$form->shouldReceive('getView->escape') $form->shouldReceive('getView->escape')
->with(Mockery::type('string')) ->with(Mockery::type('string'))
->andReturnUsing(function ($s) { return $s; }); ->andReturnUsing(function ($s) { return $s; });
@ -51,7 +52,8 @@ class LdapResourceFormTest extends BaseTestCase
Mockery::mock()->shouldReceive('testCredentials')->once()->andThrow('\Exception')->getMock() Mockery::mock()->shouldReceive('testCredentials')->once()->andThrow('\Exception')->getMock()
); );
$form = Mockery::mock('Icinga\Forms\Config\Resource\LdapResourceForm[getView]'); // Passing array(null) is required to make Mockery call the constructor...
$form = Mockery::mock('Icinga\Forms\Config\Resource\LdapResourceForm[getView]', array(null));
$form->shouldReceive('getView->escape') $form->shouldReceive('getView->escape')
->with(Mockery::type('string')) ->with(Mockery::type('string'))
->andReturnUsing(function ($s) { return $s; }); ->andReturnUsing(function ($s) { return $s; });