Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Fork of the Icinga Director
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Linuxfabrik
Fork of the Icinga Director
Commits
0ac59534
Commit
0ac59534
authored
5 years ago
by
Navid Sassan
Browse files
Options
Downloads
Patches
Plain Diff
fixed another problem with the datalist import
parent
85e7e026
No related branches found
Branches containing commit
Tags
v1.7.2.2020020403
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
library/Director/Objects/DirectorDatafield.php
+10
-5
10 additions, 5 deletions
library/Director/Objects/DirectorDatafield.php
module.info
+1
-1
1 addition, 1 deletion
module.info
with
11 additions
and
6 deletions
library/Director/Objects/DirectorDatafield.php
+
10
−
5
View file @
0ac59534
...
...
@@ -2,6 +2,7 @@
namespace
Icinga\Module\Director\Objects
;
use
Icinga\Exception\NotFoundError
;
use
Icinga\Module\Director\Core\Json
;
use
Icinga\Module\Director\Data\Db\DbObjectWithSettings
;
use
Icinga\Module\Director\Db
;
...
...
@@ -77,11 +78,15 @@ class DirectorDatafield extends DbObjectWithSettings
$plain
->
settings
=
(
object
)
$this
->
getSettings
();
if
(
property_exists
(
$plain
->
settings
,
'datalist_id'
))
{
$plain
->
settings
->
datalist
=
DirectorDatalist
::
loadWithAutoIncId
(
$plain
->
settings
->
datalist_id
,
$this
->
getConnection
()
)
->
get
(
'list_name'
);
unset
(
$plain
->
settings
->
datalist_id
);
// It is possible that the datalist does not exists yet, but is part of the new basket
try
{
$plain
->
settings
->
datalist
=
DirectorDatalist
::
loadWithAutoIncId
(
$plain
->
settings
->
datalist_id
,
$this
->
getConnection
()
)
->
get
(
'list_name'
);
}
catch
(
NotFoundError
$e
)
{
}
unset
(
$plain
->
settings
->
datalist_id
);
}
return
$plain
;
...
...
This diff is collapsed.
Click to expand it.
module.info
+
1
−
1
View file @
0ac59534
Name: Icinga Director
Version: 1.7.2.202002040
2
Version: 1.7.2.202002040
3
Depends: reactbundle (>=0.7.0), ipl (>=0.3.0), incubator (>=0.5.0)
Description: Director - Config tool for Icinga 2
Icinga Director is a configuration tool that has been designed to make
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment