Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Maarch
maarchRM
Commits
751c660c
Verified
Commit
751c660c
authored
Feb 06, 2018
by
Prosper De Laure
Browse files
FIX : #7061 The sub archive adding button is hidden if the archive is a file
parent
f87da968
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/presentation/maarchRM/Presenter/recordsManagement/welcome.php
View file @
751c660c
...
...
@@ -198,9 +198,11 @@ class welcome
}
$acceptArchiveWithoutProfile
=
$archivalProfile
->
acceptArchiveWithoutProfile
;
$fileplanLevel
=
$archivalProfile
->
fileplanLevel
;
$acceptUserIndex
=
$archivalProfile
->
acceptUserIndex
;
}
else
{
$acceptArchiveWithoutProfile
=
true
;
$fileplanLevel
=
true
;
}
}
...
...
@@ -216,6 +218,7 @@ class welcome
$this
->
view
->
setSource
(
"archive"
,
$archive
);
$this
->
view
->
setSource
(
"depositPrivilege"
,
$depositPrivilege
);
$this
->
view
->
setSource
(
"archivalProfileList"
,
$archivalProfileList
);
$this
->
view
->
setSource
(
"fileplanLevel"
,
$fileplanLevel
);
$this
->
view
->
setSource
(
"acceptArchiveWithoutProfile"
,
$acceptArchiveWithoutProfile
);
$this
->
view
->
setSource
(
"acceptUserIndex"
,
$acceptUserIndex
);
$this
->
view
->
setSource
(
'managementPrivilege'
,
\
laabs
::
callService
(
'auth/userAccount/readHasprivilege'
,
"archiveManagement/modify"
));
...
...
src/presentation/maarchRM/Resources/view/dashboard/mainScreen/archiveInformation.html
View file @
751c660c
...
...
@@ -5,8 +5,8 @@
<input
class=
"originatingDate hide"
value=
"[?merge archive.originatingDate ?]"
>
<div
class=
"col-xs-12"
>
<?merge acceptArchiveWithoutProfile.bool().add(archivalProfileList.count()).bool()
?>
<div
id=
"archiveToolbarBtn"
class=
"dropdown pull-right btn-group"
>
<?merge acceptArchiveWithoutProfile.bool().add(archivalProfileList.count()).bool()?>
<div
id=
"archiveToolbarBtn"
class=
"dropdown pull-right btn-group
[?merge fileplanLevel.ifeq('file').then('hide','') ?]
"
>
<button
type=
"button"
class=
"btn btn-sm btn-default dropdown-toggle [?merge depositPrivilege.not().then('disabled', '') ?]"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"true"
title=
"New archive"
><span
class=
"fa fa-plus"
></span></button>
<ul
class=
"dropdown-menu"
aria-labelledby=
"dropdownMenu1"
>
<?merge acceptArchiveWithoutProfile.bool() ?>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment