tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,613 Commits 120 Branches 71 Tags 80 MiB
Commit Graph

2613 Commits

Author SHA1 Message Date
Johannes Meyer 82d2f5ac9b Revert "Merge branch 'feature/install-wizard-6136'" 
This reverts commit 88d4262e7c, reversing
changes made to 6fae333048.

Conflicts:

	application/controllers/InstallController.php
	library/Icinga/Web/Controller/ActionController.php
 2014-07-07 15:09:03 +02:00
Johannes Meyer 1950c09478 Remove encoding suffix from locale identifiers 
We do not need those as the encoding of a gettext-catalog is already
mentioned in its header.

refs #6602
 2014-07-07 09:09:22 +02:00
Johannes Meyer b3cb29d804 Make Icinga\Util\Tranlsator not only return locale codes with encodings 
refs #6602
 2014-07-07 09:09:22 +02:00
Thomas Gelf e3b2f15863 list/hosts: show unhandled services righthand 
This way we automagically fix the problem with the wrong row links.
I guess we should re-introduce the "row-action" class allowing "precedence"
rules, so also a link not being the first one in a row could act as "row-link".

Changed formatting / text output a little bit, IMO even more cure is needed.

fixes #6645
 2014-07-04 18:13:44 +02:00
Matthias Jentsch d2098be625 Only display header when not in compact mode 
fixes #6508
 2014-07-04 12:45:17 +02:00
Thomas Gelf 0d4166b1bd ModuleActionController: fix reference, var removed 2014-07-04 12:39:23 +02:00
Thomas Gelf 3cfdf4c977 Web\Response: add redirection function 
The response now provides redirectAndExit(). One more step to clean up
our action controller. Please not that this is still unused right now.
 2014-07-04 12:35:33 +02:00
Thomas Gelf 3772b9c16f ActionController: set layout module name early 
Didn't work correctly before
 2014-07-04 12:33:49 +02:00
Matthias Jentsch 485e2168c1 Fix coding style 2014-07-04 11:42:24 +02:00
Matthias Jentsch 05139ae684 Fix a bug in the section map creation of the IniEditor 
Don't omit the first line when putting 'glued' comments into
the following section
 2014-07-04 11:38:30 +02:00
Matthias Jentsch fa61b601d4 Test whether section comments are moved correctly 2014-07-04 11:35:00 +02:00
Matthias Jentsch e78f01591d Fix PreservingIniWriterTest section test case 
The test case now tests whether the section order of the ini file is updated correctly and
not whether the section order is preserved

fixes #6625
 2014-07-03 17:26:55 +02:00
Eric Lippmann 839af7f363 Fix `make install-cli' 
Replace spaces with tabs.

fixes #6580
 2014-07-03 16:50:20 +02:00
Matthias Jentsch 57f3023ec4 Fix coding style 2014-07-03 16:20:45 +02:00
Matthias Jentsch 86ad5f738b Fix LdapBackendFormTest 
Alter class mocks to fit the latest changes in LdapBackendFormTest

fixes #6597
 2014-07-03 16:15:02 +02:00
Johannes Meyer 298edbe730 Merge branch 'bugfix/activate-menu-entry-based-on-the-url-6153' 
fixes #6153
 2014-07-03 15:47:04 +02:00
Johannes Meyer 143a1e44fe Add a HTML renderer for Icinga\Web\Menu 
The menu was being rendered through recursive partials before. The
overhead this fact implicates is not as efficient as standard recursion
so there is now a special renderer for Icinga\Web\Menu utilizing
the RecursiveIteratorIterator

refs #6153
 2014-07-03 15:46:46 +02:00
Johannes Meyer 8eac449d56 Adjust the test for Icinga\Web\MenuItem as its test subject has changed 
refs #6153
 2014-07-03 15:14:47 +02:00
Johannes Meyer be18af7e7e Merge Icinga\Web\MenuItem into Icinga\Web\Menu 
We do not need an additional class for the menu's root item just to
encapsulate our config handling, so these two classes were now merged
into a single one. Icinga\Web\Menu now also extends from
RecursiveIterator to be able to render the menu more efficient to html.

refs #6153
 2014-07-03 15:14:47 +02:00
Eric Lippmann 8727c9b91d Revert "tests: Fix path to `extcmd_test'" 
This reverts commit 4054bcf101.

The changed path to `extcmd_test' is actually invalid because `extcmd_test' is located beneath `<icingaweb>/modules/test/bin'.
I erroneously assumed the latter as invalid because the compiled `extcmd_test' was missing.
 2014-07-02 12:18:15 +02:00
Eric Lippmann 9b2d674c50 Merge branch 'bugfix/test-fix-6542' 
fixes #6542
 2014-07-02 11:39:28 +02:00
Eric Lippmann 4054bcf101 tests: Fix path to `extcmd_test' 
The path to `extcmd_test' is now `<icingaweb>/test/php/extcmd_test' instead of being relative to the current directory.

refs #6542
 2014-07-02 11:09:04 +02:00
Eric Lippmann 545a153490 Merge branch 'master' into bugfix/test-fix-6542 2014-07-02 10:57:08 +02:00
Johannes Meyer d4a4cf90ad Fix vagrant provisioning for icinga1.x access 2014-07-02 08:39:49 +02:00
Johannes Meyer 920c027990 Ensure that the ini writer deletes properties properly 
The fix for #5958 introduced with commit 6aaff6b3 caused the property
deletion of the PreservingIniWriter be even more faulty than before. The
actual fix for this issue is an improved procedure for how properties are
deleted as the initial implementation suffered from a few
misunderstandings in how properties in Zend_Ini files need to be handled.

fixes #6599
fixes #6601
fixes #6600
fixes #6598
fixes #6614
 2014-07-01 14:55:45 +02:00
Johannes Meyer 87e72961e8 Revert "Fix that the ini writer produces invalid configuration files" 
This reverts commit 9bec8e3c27.
 2014-07-01 14:45:00 +02:00
Johannes Meyer 9bec8e3c27 Fix that the ini writer produces invalid configuration files 
fixes #6614
 2014-07-01 14:21:46 +02:00
Matthias Jentsch dc20973581 Fix ResourceFormTest 
Add function-mock for mysqlAvaialable to prevent the unit test from breaking
 2014-06-30 18:20:19 +02:00
Matthias Jentsch 8f1959833b Fix the DbBackendFormTest 
Mock ResourceFactory in form tests

fixes #6596
 2014-06-30 18:20:19 +02:00
Matthias Jentsch fd21ba4e4d Fix violation of coding guidelines 2014-06-30 18:20:19 +02:00
Thomas Gelf 590db51255 js/loader: handle form redirections automagically 
An XHR redirection in a right-side container pointing to the URL
shown on the left should close it's own container and refresh the
lefthand one.

refs #6436
fixes #6435
 2014-06-30 16:19:05 +02:00
Johannes Meyer f3172b96e4 Remove missed echo instruction for debug purposes 2014-06-30 14:06:11 +02:00
Johannes Meyer 6a8152ce09 Merge branch 'bugfix/get-rid-of-line-based-annotations-6091' 
fixes #6091
 2014-06-30 14:01:35 +02:00
Johannes Meyer 7eb0f3c472 Remove @codingStandardsIgnoreStart/-Stop annotations 
refs #6091
 2014-06-30 13:59:58 +02:00
Johannes Meyer f2e5d8afa5 Remove @codeCoverageIgnoreStart/-Stop annotations 
refs #6091
 2014-06-30 13:58:37 +02:00
Johannes Meyer 71bd784992 Add files to skip during coverage generation to the global ignore list 
refs #6091
 2014-06-30 13:55:11 +02:00
Alexander Klimov 5b79d6e4a7 Do not expect a particular exception message 
refs #6542
 2014-06-30 13:33:17 +02:00
Matthias Jentsch 9a1b7179e1 Fix violations of coding guidelines 2014-06-30 12:33:51 +02:00
Matthias Jentsch 7fe056d03a Display note when host and service is not found 
When the show/host and show/service views do not find a host or service,
don't show a non-working view, but display a error message

fixes #6469
 2014-06-30 12:33:51 +02:00
Matthias Jentsch a2fa5c055c Display a message when a list view is empty 
fixes #6469
 2014-06-30 12:33:51 +02:00
Johannes Meyer 54f9ecb62f Add extcmd_test binary to gitignore and skip tests when its not available 2014-06-30 08:56:48 +02:00
Thomas Gelf 62928c48b0 helpers/timeSince: fix c&p error 2014-06-27 23:37:39 +02:00
Alexander Klimov 7ab984106a Replace Exception with Icinga\Exception\ProgrammingError in Icinga\Application\Loader 
refs #6542
 2014-06-27 15:20:56 +02:00
Alexander Klimov 572c7858c8 Remove test Tests\Icinga\Web\Paginator\ScrollingStyle\SlidingwithborderTest::testGetPages1 because it tests a non-present feature 
refs #6542
 2014-06-27 14:30:58 +02:00
Alexander Klimov b2ffa2aa89 Remove Test\Icinga\Web\Paginator\Adapter\QueryAdapterTest because the test tests a non-present feature 
refs #6542
 2014-06-27 14:30:57 +02:00
Alexander Klimov 6ccebf45c8 Fix test Tests\Icinga\Form\Config\Resource\ResourceFormTest because the method being tested has been changed 
refs #6542
 2014-06-27 14:30:57 +02:00
Alexander Klimov 23baa0dc83 Fix test Icinga/File/CsvTest.php because the method being tested has been changed 
refs #6542
 2014-06-27 14:30:57 +02:00
Alexander Klimov 4b72e1b54f Revert "Fix PHP Fatal error "Method Icinga\File\Csv::__toString() must not throw an exception in /vagrant/test/php/library/Icinga/File/CsvTest.php on line 35"" 
This reverts commit f2fdd7f39df759ff27c9c133f40bbcae14820708.
 2014-06-27 14:30:57 +02:00
Alexander Klimov 22e13ce282 Replace DatasourceInterface with Selectable in Icinga/Protocol/Statusdat/Reader 
refs #6542
 2014-06-27 14:30:57 +02:00
Alexander Klimov c0b44c3248 Revert "Fix PHP Fatal error "Interface Icinga\Data\DatasourceInterface not found in /vagrant/library/Icinga/Protocol/Statusdat/Reader.php on line 41"" 
This reverts commit 35e12c2053685a6951765a007a0e3f8c7999734f.
 2014-06-27 14:30:57 +02:00