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
Commits
f37649f5
Unverified
Commit
f37649f5
authored
4 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(setup) Fix crashes and problems in web setup
issue
#6122
parent
37f09e4f
dev
6342-update-the-locales-for-1-5
6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen
6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account
6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock
6378-orcid-test-method-is-wrong-and-break-orcid-saving
6379-core-ogroups-creation-with-backend-default-user-available-for-selection
core-php8
master
fusiondirectory-1.5
fusiondirectory-1.4
fusiondirectory-1.3.1
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
setup/class_setupStep.inc
+1
-1
setup/class_setupStep.inc
setup/class_setupStepMigrate.inc
+4
-2
setup/class_setupStepMigrate.inc
with
5 additions
and
3 deletions
+5
-3
setup/class_setupStep.inc
+
1
−
1
View file @
f37649f5
...
...
@@ -93,7 +93,7 @@ class setupStep extends simplePlugin
}
/* Return attributes handled by this setup step */
function
get_attributes
()
public
function
get_attributes
()
{
$tmp
=
array
();
foreach
(
array_keys
(
$this
->
attributesAccess
)
as
$attr
)
{
...
...
This diff is collapsed.
Click to expand it.
setup/class_setupStepMigrate.inc
+
4
−
2
View file @
f37649f5
...
...
@@ -407,7 +407,7 @@ class setupStepMigrate extends setupStep
$mods
[
'ou'
]
=
$val
;
}
/*Append description, it is required by gosaDepartment too */
/*
Append description, it is required by gosaDepartment too */
if
(
!
isset
(
$attrs
[
'description'
]))
{
$val
=
"GOsa"
;
if
(
isset
(
$attrs
[
$dep_infos
[
'mainAttr'
]][
0
]))
{
...
...
@@ -420,7 +420,7 @@ class setupStepMigrate extends setupStep
$this
->
rootOC_details
[
'target'
]
=
$str
;
$this
->
rootOC_details
[
'mods'
]
=
$mods
;
/*
Add button that allows to open the migration details */
/* Add button that allows to open the migration details */
throw
new
CheckFailedException
(
_
(
'Failed'
),
' '
.
$checkobj
->
submit
()
...
...
@@ -433,6 +433,8 @@ class setupStepMigrate extends setupStep
function
check_baseOC_migrate
(
&
$checkobj
)
{
/* Refresh $this->rootOC_details */
$checkobj
->
run
();
$this
->
openDialog
(
new
StepMigrateDialog
(
$checkobj
,
'setup_migrate_baseOC.tpl'
,
$this
->
rootOC_details
));
}
...
...
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