Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory-plugins
Commits
4035c3a4
Verified
Commit
4035c3a4
authored
6 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
ambulance: fix(fai) Fix LVM creation dialog
issue #5821
parent
015c6c14
dev
6245-adapt-the-ci-to-the-reorganisation-of-the-dev-tools-and-fixing-the-trigger-downstream-pipelines
6250-supann-configuration-backend-requires-account-life-cycle-section
6280-plugins-update-plugins-to-take-into-consideration-the-new-directory-of-core-structure
6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id
6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5
6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2
6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases
6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user
6341-supann-extract-resources-states-sub-states-from-backend-configuration-to-their-own-objects
6346-lifecycle-adaptation-to-select-supann-resources-and-related-states-via-regex-mechanism
master
fusiondirectory-1.5
fusiondirectory-1.4
fusiondirectory-1.3.1
fusiondirectory-1.3
fusiondirectory-1.2.3
fusiondirectory-1.2.2
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
fai/admin/fai/class_faiDiskEntry.inc
+11
-8
fai/admin/fai/class_faiDiskEntry.inc
with
11 additions
and
8 deletions
+11
-8
fai/admin/fai/class_faiDiskEntry.inc
+
11
−
8
View file @
4035c3a4
...
@@ -289,8 +289,18 @@ class faiDiskEntry extends simplePlugin
...
@@ -289,8 +289,18 @@ class faiDiskEntry extends simplePlugin
{
{
parent
::
__construct
(
$dn
,
NULL
,
$parent
);
parent
::
__construct
(
$dn
,
NULL
,
$parent
);
if
(
$disk
)
{
$this
->
is_edit
=
TRUE
;
$this
->
cn
=
$disk
[
'cn'
];
$this
->
description
=
$disk
[
'description'
];
$this
->
attributesAccess
[
'cn'
]
->
setInitialValue
(
$this
->
cn
);
}
$this
->
FAIdiskType
=
$type
;
$this
->
FAIdiskType
=
$type
;
if
(
$this
->
FAIdiskType
!=
'lvm'
)
{
if
(
$this
->
FAIdiskType
==
'lvm'
)
{
$this
->
attributesAccess
[
'lvmDevices'
]
->
attribute
->
setChoices
(
$this
->
getAvailablePartitions
());
}
else
{
$this
->
attributesAccess
[
'lvmDevices'
]
->
setDisabled
(
TRUE
);
$this
->
attributesAccess
[
'lvmDevices'
]
->
setDisabled
(
TRUE
);
$this
->
attributesAccess
[
'lvmDevices'
]
->
setVisible
(
FALSE
);
$this
->
attributesAccess
[
'lvmDevices'
]
->
setVisible
(
FALSE
);
}
}
...
@@ -309,14 +319,7 @@ class faiDiskEntry extends simplePlugin
...
@@ -309,14 +319,7 @@ class faiDiskEntry extends simplePlugin
}
}
if
(
$disk
)
{
if
(
$disk
)
{
$this
->
is_edit
=
TRUE
;
$this
->
cn
=
$disk
[
'cn'
];
$this
->
description
=
$disk
[
'description'
];
$this
->
attributesAccess
[
'cn'
]
->
setInitialValue
(
$this
->
cn
);
/* Get devices used in volume base disks */
/* Get devices used in volume base disks */
$this
->
attributesAccess
[
'lvmDevices'
]
->
attribute
->
setChoices
(
$this
->
getAvailablePartitions
());
if
(
isset
(
$disk
[
'FAIlvmDevice'
]))
{
if
(
isset
(
$disk
[
'FAIlvmDevice'
]))
{
$this
->
lvmDevices
=
$disk
[
'FAIlvmDevice'
];
$this
->
lvmDevices
=
$disk
[
'FAIlvmDevice'
];
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
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
Menu
Explore
Projects
Groups
Topics
Snippets