cd0c418854
Merge branch 'master' into feature/user-and-group-management-8826
2015-06-02 10:44:13 +02:00
5d50eabb44
FileReader: Mimic cursor capability
2015-06-02 10:39:49 +02:00
ae30a62055
ConfigController: Add tab for the user group backend configuration
...
refs #8826
2015-06-02 10:23:40 +02:00
cf96e66ff2
Rename permission config/application/roles* to config/authentication/...
...
Does also split it into *, show, add, edit, remove as this should behave like
any other authentication configuration.
refs #8826
2015-06-02 09:07:06 +02:00
3fffd90135
Rename permission config/application/groups* to config/authentication/...
...
refs #8826
2015-06-02 09:04:34 +02:00
a558f2873a
Rename permission config/application/users* to config/authentication/...
...
refs #8826
2015-06-02 09:02:57 +02:00
46e2393074
UsergroupbackendController: Do only assert that the user has one permission
...
The configuration of a backend itself should not be that granular.
refs #8826
2015-06-02 08:58:21 +02:00
44968266f6
Fix no-op searches
...
Depeding on the current filter, Filter::andFilter() may return a new filter object w/ the and filter applied or the and filter is applied to the object itself.
The FilterEditor did not make use of the return value of Filter::andFilter() thus resulting in no-op searches in some scenarios.
2015-06-01 17:22:52 +02:00
7b9983de38
Merge the menu entries for users, groups and roles into "Authentication"
2015-06-01 17:16:24 +02:00
6661d49bd2
Use ltrim instead of a manual loop to remove trailing lines in ini writer
...
refs #8706
2015-06-01 17:00:43 +02:00
17e7f1e754
Link the roles configuration with the user and group management
...
refs #8826
2015-06-01 16:43:11 +02:00
66fd7dfd93
ConfigController: Rename applicationAction to generalAction
2015-06-01 16:35:27 +02:00
49bb09d9d3
Add dedicated menu entries to manage users, groups and roles
...
refs #8826
2015-06-01 16:31:48 +02:00
1901f0af98
Improve .ini file formatting
...
End every file with a newline, and only display 1 empty line between each section, to improve readabillity.
fixes #8706
2015-06-01 16:12:02 +02:00
c7ce1498bf
Introduce menu entry "Configuration"
2015-06-01 16:10:23 +02:00
e936c76ca9
DbUserGroupBackend: Really clear memberships and parent relations...
...
...when removing a group.
refs #8826
2015-06-01 15:34:38 +02:00
1385295e4e
DbUserGroupBackend: Properly handle sequences of group names
...
refs #8826
2015-06-01 15:33:35 +02:00
62fff94808
DbUserGroupBackend: Do not try to fetch a group id for null
...
refs #8826
2015-06-01 15:16:03 +02:00
beb5bd7370
Repository: Clone a filter implicitly in self::requireFilter($clone = true)
...
refs #8826
2015-06-01 15:03:08 +02:00
601b720a03
LdapUserBackend: Fetch and interpret the correct attributes (OpenLDAP)
...
refs #8826
2015-06-01 14:05:44 +02:00
d1a5321d02
LdapUserBackend: Fetch and interpret the correct attributes (ActiveDirectory)
...
refs #8826
2015-06-01 12:23:16 +02:00
7127d5eb39
Ldap\Connection: Connect automatically in case capabilities are not set yet
2015-06-01 12:20:36 +02:00
d097f7fe8f
Add menu entry for the user group backend configuration
...
That's definitely just a placeholder...
refs #8826
2015-05-29 16:36:05 +02:00
0ba4d24880
Move notifications to the bottom of the page
...
refs #8247
2015-05-29 14:17:12 +02:00
c8e8a39f5a
DbRepository: Relax check in providesValueConversion()
...
Would otherwise conflict when tables are joined in.
refs #8826
2015-05-29 11:58:21 +02:00
cc779024fe
Repository: providesValueConversion() should not be required being called
...
refs #8826
2015-05-29 11:57:38 +02:00
b82d7d7cc0
DbRepository: split() is deprecated, use explode() instead
...
Why php, why? :'(
refs #8826
2015-05-29 11:37:42 +02:00
3959dc27d7
Repository: Do not return filter columns when requiring all query columns
...
I really wonder why I did not notice this until now...
refs #8826
2015-05-29 11:36:08 +02:00
a88037f45d
DbUserGroupBackend: Fetch and persist a group's id when it's name is given
...
refs #8826
2015-05-29 11:33:35 +02:00
bb285db05b
Differentiate the source or destination of a column when converting values
...
refs #8826
2015-05-29 11:32:15 +02:00
60ce78c958
DbUserGroupBackend: Adjust how to load the name of a group's parent
...
refs #8826
2015-05-29 08:57:49 +02:00
c94e6a3292
Db/IniUserGroupBackend: Drop column parent_name, it's not a name anymore
...
refs #8826
2015-05-29 08:56:58 +02:00
5e0ae6410b
DbRepository: Consider a filter column without query context as a statement column
...
Feels wrong..somehow, but it works.
refs #8826
2015-05-29 08:02:12 +02:00
32b99be8ab
DbUserGroupBackend: Adjust to fit the new database schema
...
refs #8826
2015-05-28 15:22:15 +02:00
fd931e4232
RepositoryQuery: getQuery() might be called during prepareQueryColumns()
2015-05-28 14:26:48 +02:00
08f8fe6f49
DbRepository: Add support for joining tables based on query/filter columns
...
refs #8826
2015-05-28 13:53:49 +02:00
119b2fdddb
DbQuery: Allow to join additional tables
...
This should just be the beginning of such additions, there is still a group(),
distinct(), etc missing..
2015-05-28 13:52:00 +02:00
58d78f59f3
DbQuery: Initialize self::$select as early as possible
...
I'd like to use Zend's implementation instead of re-inventing the wheel just
because someone decided to only work with a copy of it in the frameworks
query but do exactly the opposite in the monitoring module's IDO query...
2015-05-28 13:49:36 +02:00
5326ce6bca
DbRepository: Add support for table specific aliases
...
This was previously only possible for the base table and in case one wanted
to use table aliases in the query column definition for non-base tables as
well, it did not work well due to not being explicitly supported. Now, to use
such table aliases one must initialize DbRepository::tableAliases.
refs #8826
2015-05-28 13:44:51 +02:00
647dd9d425
RepositoryQuery: Pass through the query when requiring a table or column
...
This allows now to adjust the query in custom repository implementations.
refs #8826
2015-05-28 13:25:26 +02:00
31400ea16a
monitoring: Fix that searching for specific columns is no longer possible if default search columns are set
2015-05-28 13:17:00 +02:00
bf21f55656
Add a new ssh resource form
...
refs #7595
2015-05-28 10:44:58 +02:00
cba36ec017
Ignore the preferences' loadability during authentication
...
fixes #8956
2015-05-27 15:13:53 +02:00
23b7ab0764
DbRepository: Remove COLLATE from a query column in case of a pgsql connection
...
refs #8826
2015-05-27 11:47:18 +02:00
8713f59e66
AuthBackendController: Only show tabs the user is permitted to view
...
refs #8826
2015-05-27 10:38:35 +02:00
b842a39650
Implement ::getLinuxDistro()
...
refs #8705
2015-05-26 18:23:26 +02:00
237b50f953
RepositoryQuery: Ensure that we'll adjust a copy of a filter
2015-05-26 14:32:47 +02:00
20f0b46574
Introduce class AuthBackendController
...
refs #8826
2015-05-26 10:11:40 +02:00
ec556edc65
Merge branch 'master' into feature/user-and-group-management-8826
2015-05-26 09:28:35 +02:00
54354b17bf
DbConnection: Replicate the fix for #9211
2015-05-26 09:26:55 +02:00
b0f7773260
lib: Fix sprintf format strings used in Format::seconds()
...
fixes #9291
Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
2015-05-22 16:06:11 +02:00
4f0b4e55ef
ErrorLabeller: Use an element's name if no label is set
2015-05-22 14:01:26 +02:00
83a6e85b5d
lib: Don't render empty filters to SQL
...
Else we are presented with syntax errors.
fixes #9211
2015-05-22 13:53:57 +02:00
53ca68903a
Merge branch 'bugfix/time-formatting-6778'
...
fixes #6778
2015-05-22 11:34:43 +02:00
3fced8472b
lib: Remove unused function from our format util
...
refs #6778
2015-05-22 10:27:50 +02:00
265725447d
Merge branch 'master' into feature/user-and-group-management-8826
2015-05-22 10:06:31 +02:00
de9be044b3
lib: Provide formatDuration() in our views
...
refs #6778
2015-05-22 10:04:00 +02:00
edd386e14b
lib: Add DateFormatter::formatDuration()
...
refs #6778
2015-05-22 09:49:06 +02:00
dd298edb81
lib: Only invert relative partial times if necessary
...
refs #6778
2015-05-22 09:33:51 +02:00
2bdb725370
Merge branch 'bugfix/monitoring-controllers-response-codes-6281'
...
fixes #6281
2015-05-22 09:27:51 +02:00
d2bb74a2f9
lib: Move HttpNotFoundException beneath the Http Exception namespace
...
refs #6281
2015-05-22 09:25:49 +02:00
71a2324cb9
lib: Let Controller::assertHttpMethod() throw a HttpMethodNotAllowedException
...
refs #6281
2015-05-22 09:12:42 +02:00
fde60f4a00
lib: Add HttpMethodNotAllowedException
...
At the moment we throw a Zend_Controller_Action_Exception when the HTTP method is not allowed.
I'll replace this w/ the exception introduced.
refs #6281
2015-05-21 17:19:07 +02:00
fcd7aaef87
lib: Add HttpException as base class for HTTP exceptions
...
refs #6281
2015-05-21 17:18:29 +02:00
dd1025119d
Throw HttpNotFoundException on Controller::httpNotFound()
...
refs #6281
2015-05-21 16:54:00 +02:00
c4ed49cb1a
lib: Add HttpNotFoundException
...
The HttpNotFoundException should be used for sending a HTTP 404 response w/ a custom message.
There's also Zend_Controller_Action_Exception but this exception will always show 'Page not found' because we
want to hide messages generated by Zend, like 'Action "foobar" does not exist and was not trapped in __call()'.
refs #6281
2015-05-21 16:43:58 +02:00
fac2ebce80
RepositoryQuery: Fix handling of queries returning no results in fetchColumn()
...
refs #8826
2015-05-21 15:02:56 +02:00
4833ff109c
RepositoryQuery: Validate the table passed when calling from()
...
refs #8826
2015-05-21 15:01:13 +02:00
54577d04bd
Merge branch 'master' into bugfix/time-formatting-6778
...
Conflicts:
modules/monitoring/application/views/scripts/list/comments.phtml
modules/monitoring/application/views/scripts/list/hostgroups.phtml
modules/monitoring/application/views/scripts/process/info.phtml
modules/monitoring/application/views/scripts/show/components/downtime.phtml
modules/monitoring/application/views/scripts/show/components/notifications.phtml
modules/monitoring/public/css/module.less
2015-05-21 14:57:01 +02:00
0002c0be26
Provide default config name for Module::getConfig()
2015-05-21 14:40:52 +02:00
c47465a732
lib/filter: Fix check against unset search columns
...
refs #8241
2015-05-21 14:04:04 +02:00
10b158a182
LdapUserBackend: Fix sorting when sorting by user_name
...
refs #8826
2015-05-21 13:53:27 +02:00
4d79731646
DbUserBackend: Fix sorting when sorting by user_name
...
refs #8826
2015-05-21 13:53:18 +02:00
ba31be9695
RepositoryQuery: Disim.. Fix sort order handling
...
refs #8826
2015-05-21 13:52:43 +02:00
9278d708d7
IniUserGroupBackend: Do not sort by parent when sorting by group_name
...
refs #8826
2015-05-21 13:51:24 +02:00
6369643145
DbUserGroupBackend: Do not sort by parent when sorting by group_name
...
refs #8826
2015-05-21 13:51:15 +02:00
970d4d7a4a
Fix that time-until doesn't show negative partial time in the dashboard
...
refs #6778
2015-05-21 10:19:07 +02:00
b9a6e1042d
Merge branch 'master' into bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241
...
Conflicts:
modules/monitoring/application/controllers/ListController.php
2015-05-20 17:02:49 +02:00
0dda19dc7a
DbRepository: Remove the table prefix when resolving statement columns
...
refs #8826
2015-05-20 11:50:09 +02:00
71fa736144
Merge branch 'master' into feature/user-and-group-management-8826
2015-05-20 10:46:55 +02:00
902c00e836
lib: Introduce Controller::httpNotFound()
...
Many actions require loading specific objects from database or any other storage.
If the object isn't found, Controller::httpNotFound($message) should be used
for immediately returning w/ HTTP 404.
2015-05-20 10:30:01 +02:00
338fad5da9
cli: Add Params::shiftRequired()
2015-05-20 10:30:00 +02:00
ccaebd1d73
cli: Rename Params::req() to ::getRequired()
2015-05-20 10:30:00 +02:00
3d1c3609c0
lib: Add UrlParams::shiftRequired()
2015-05-20 10:30:00 +02:00
3a2238f737
Rename UrlParams::req() to ::getRequired()
...
req() seems mysterious :)
2015-05-20 10:30:00 +02:00
093857641a
DbConnection: Cast a queries count to integer forcefully
2015-05-20 09:30:23 +02:00
a3d5cfc28a
RepositoryQuery: Properly handle queries returning no results
...
refs #8826
2015-05-20 09:11:46 +02:00
cc050ed696
Display an error notification rather than throwing an exception
...
refs #8241
2015-05-19 17:36:24 +02:00
3243f9a65a
Don't handle the case $this->searchColumns === null for actions in which ::setSearchColumns() is called
...
refs #8241
2015-05-19 17:36:23 +02:00
2715e8ed2b
Revert "Set default locale for the intl extension upon locale detection"
...
This reverts commit 06830e035e#6778
2015-05-19 16:21:57 +02:00
fb07f0b94c
Merge branch 'master' into feature/user-and-group-management-8826
...
Conflicts:
library/Icinga/Authentication/Backend/LdapUserBackend.php
library/Icinga/Protocol/Ldap/Query.php
2015-05-19 14:14:03 +02:00
bd7c7f9636
Introduce widget Paginator
...
This does not support custom scrolling styles as of now. Custom view
scripts are supported though. In case Paginator::getPages() does not
suffice, feel free to improve this.
2015-05-19 13:57:21 +02:00
73e8c51fd1
Ldap\Query: Remove method paginate()
2015-05-19 13:57:20 +02:00
14b24ff57d
Use international standard date and time notation ...
...
... instead of depending on the locale.
We hardcode date and time formats all over the place anyway.
refs #6778
2015-05-19 13:26:46 +02:00
9edc4a129b
Fix date-and-time tooltips not showing the time
...
refs #6778
2015-05-19 13:25:57 +02:00
4f4d7ccba2
Correct PHPDoc of ::setSearchColumns()
2015-05-19 12:55:40 +02:00
f968984feb
Drop the DateTimeRenderer
...
refs #6778
2015-05-19 12:46:08 +02:00
f028c74a5e
Improve parameter names for the date formatting functions
...
refs #6778
2015-05-19 11:25:54 +02:00
603dcbde92
Drop the DateTimeFactory
...
refs #6778
2015-05-19 11:25:32 +02:00
1d6ef5ec3a
Don't setup the DateTimeFactory in our tests
...
DateTimeFactory will be removed soon.
refs #6778
2015-05-19 11:25:06 +02:00
ba258524a8
Don't setup the DateTimeFactory when bootstrapping Icinga Web 2
...
DateTimeFactory will be removed soon.
refs #6778
2015-05-19 11:23:50 +02:00
ab7c529094
Show the expected input format if a date-and-time input is not valid
...
refs #6778
2015-05-19 11:22:23 +02:00
5cf8e2504e
lib/grid: Use PHP's DateTime instead of our DateTimeFactory
...
I'm about to drop the DateTimeFactory because date_default_timezone_set() in combination w/ PHP's DateTime is sufficient.
refs #6778
2015-05-19 11:14:41 +02:00
1ce9900c86
Add PHPDoc to ::setSearchColumns()
2015-05-19 11:12:36 +02:00
e87067db3b
lib/chart: Use PHP's DateTime instead of our DateTimeFactory
...
I'm about to drop the DateTimeFactory because date_default_timezone_set() in combination w/ PHP's DateTime is sufficient.
refs #6778
2015-05-19 11:10:35 +02:00
d53c3d7075
Add view helper functions for formatting, date, date and time, and time
...
refs #6778
2015-05-19 10:10:23 +02:00
a66cb907ae
Remove dateTimeRenderer view helper
...
The helper is no longer used anywhere.
refs #6778
2015-05-19 10:06:19 +02:00
1301b77547
Use DateFormatter::formatDate() for formatting the date and time tooltip in the format view helper
...
refs #6678
2015-05-19 10:04:17 +02:00
2eb93d0309
Remove time formatting functions from the format util
...
The DateFormatter class now has these functions.
refs #6778
2015-05-19 09:56:48 +02:00
9477fdcea4
Use DateFormatter's format functions in the format view helper
...
refs #6778
2015-05-19 09:56:20 +02:00
bf8c4f1e9d
Replace DateFormatter format constants w/ format functions
...
refs #6778
2015-05-19 09:55:21 +02:00
f305a334d5
DbConnection: Drop param $columnIndex in fetchColumn(), it's unused
2015-05-19 09:48:20 +02:00
cf989a0f7f
SimpleQuery: Implement interface Iterator to benchmark result iteration
2015-05-19 09:41:55 +02:00
a1276fd709
Benchmark all queries by default, not only db queries
2015-05-19 09:41:18 +02:00
7b6ca0826b
DbQuery: Let the DbConnection do the count query
2015-05-19 09:34:22 +02:00
9af25acf38
RepositoryQuery: Benchmark when iterating a query's result
...
refs #8826
2015-05-18 16:02:55 +02:00
0e0341f78a
It's the connection which provides a cursor, not the query
2015-05-18 16:01:58 +02:00
592d5eadc1
Merge branch 'feature/improve-multi-select-view-8565'
2015-05-18 16:00:52 +02:00
742dfcaf41
Revert "Fetchable: Add method fetch() which returns an iterator"
...
This reverts commit 7a6837de0e
2015-05-18 15:17:22 +02:00
aaa8e4bf6a
Don't render time information when the timestamp evaluates to false
...
refs #6778
2015-05-18 14:40:55 +02:00
be36809552
RepositoryQuery: Implement interface Iterator
...
refs #8826
2015-05-18 14:05:02 +02:00
3f25cf560e
RepositoryQuery: Remove method paginate()
...
refs #8826
2015-05-18 14:03:22 +02:00
d39c697d0e
Repository: QueryInterface is _not_ queryable anymore...
...
refs #8826
2015-05-18 14:01:17 +02:00
7a6837de0e
Fetchable: Add method fetch() which returns an iterator
2015-05-18 13:59:16 +02:00
82ee1d6e60
Merge branch 'master' into bugfix/significant-whitespaces-8777
...
Conflicts:
library/Icinga/Web/Widget/FilterEditor.php
2015-05-18 13:35:28 +02:00
524c449649
Merge branch 'master' into feature/user-and-group-management-8826
2015-05-18 11:28:07 +02:00
130fea3146
Revert "Merge Queryable into QueryInterface"
...
This reverts commit ca5ef2da2b
2015-05-18 11:25:02 +02:00
2cbcea25cb
Merge branch 'feature/ido-resource-validation-9203'
...
fixes #9214
resolves #9203
2015-05-15 15:59:18 +02:00
99c511eefd
Limiter: Do not use a hardcoded default limit
2015-05-15 15:22:22 +02:00
9a043386de
Controller: Make setupSortControl creating a Zend_Paginator on its own
...
We're accessing the url GET parameters `sort' and `dir' in a controller now.
fixes #8339
2015-05-15 14:37:41 +02:00
fbf0ad4339
Drop interface Browsable
...
We're not required to handle objects of Zend_Paginator in any way, so
creating such as part of a query is not necessary since QueryAdapter
accepts any instance of QueryInterface. (gets enforced in the near future)
refs #8339
2015-05-15 14:37:41 +02:00
ed5f646b6f
SimpleQuery: Implement interface IteratorAggregate
...
I'd like to foreach such.
2015-05-15 14:37:41 +02:00
e04655e8cf
Controller: Apply the user chosen sort rules when in compact view as well
2015-05-15 14:37:41 +02:00
ad8903660d
Revert "SortBox::handleRequest(): set query order direction to asc if it's not given"
...
This reverts commit 59753acece
2015-05-15 14:37:41 +02:00
9f35db71bf
Form: Add typed notifications to the form
...
refs #9203
2015-05-15 13:04:01 +02:00
1eb11625ef
Add new FormNotification Decorator to render form notifications
...
refs #9203
2015-05-15 13:02:54 +02:00
59753acece
SortBox::handleRequest(): set query order direction to asc if it's not given
2015-05-13 14:40:40 +02:00
e9fee2dad6
Repository: Handle column name ambiguousness automatically
...
refs #8826
2015-05-13 13:27:08 +02:00
0a387573f3
Logger: Fix substitution of exception messages
2015-05-13 10:46:34 +02:00
f93c2de6be
UserGroupBackend: Disable default backend type `ini'
...
We're not going to support this until a proper membership implementation
exists (or is required at all).
refs #8826
2015-05-13 10:45:54 +02:00
223ecab991
DbUserGroupBackend: Make it possible to handle memberships
...
refs #8826
2015-05-13 10:34:39 +02:00
47dfcf5e1d
DbUserGroupBackend: Do not use the repository abstraction internally
...
That's overhead which is not necessary.
refs #8826
2015-05-13 10:34:00 +02:00
7d982068a5
DbRepository: Ensure that we'll work with a instance of DbConnection
...
refs #8826
2015-05-13 09:52:29 +02:00
d5d0c67d2c
IniRepository: Do not handle $target as a section's name
...
That's bullshit.
refs #8826
2015-05-13 09:48:46 +02:00
104c1c6bba
DbUserBackend: Utilize Zend_Db_Select when fetching the password hash
2015-05-13 09:16:24 +02:00
7d08dd2765
DbConnection: Adjust insert and update to support custom type definitions
...
This strips the custom insert and update implementataions in
DbUserBackend down so that it does not need to do such low level stuff...
refs #8826
2015-05-13 09:15:18 +02:00
aa466ae721
Merge branch 'master' into feature/user-and-group-management-8826
2015-05-13 08:11:59 +02:00
d43513dcac
Controller: use Icinga\Data\Sortable
2015-05-12 16:38:31 +02:00
c91d3e52ac
Merge branch 'master' into feature/user-and-group-management-8826
2015-05-12 15:39:02 +02:00
053c9cdcb3
Repository: Check whether a column is queried from the correct table
...
refs #8826
2015-05-12 15:38:29 +02:00
Johannes Meyer
Eric Lippmann
Matthias Jentsch
Alexander A. Klimov
Alexander Fuhr
rbelinsky
Marius Hein