Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Maarch
maarchRM
Commits
869ef605
Commit
869ef605
authored
Feb 25, 2020
by
Alexandre Morin
Browse files
Merge branch 'develop' into 'Support/2.6.X'
develop into Support/2.6.X See merge request
!427
parents
2b7f6e75
c07a3906
Pipeline
#7033
canceled with stages
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
src/bundle/organization/Controller/organization.php
View file @
869ef605
...
...
@@ -276,12 +276,6 @@ class organization
foreach
(
$organizationList
as
$organization
)
{
$parentOrgId
=
(
string
)
$organization
->
parentOrgId
;
if
(
$user
->
ownerOrgId
&&
$organization
->
ownerOrgId
!=
$user
->
ownerOrgId
)
{
if
(
empty
(
$parentOrgId
)
&&
$organization
->
orgId
!=
$user
->
ownerOrgId
)
{
continue
;
}
}
if
(
empty
(
$parentOrgId
)
&&
$owner
)
{
$tree
[]
=
$organization
;
continue
;
...
...
@@ -292,6 +286,12 @@ class organization
continue
;
}
if
(
$user
->
ownerOrgId
&&
$organization
->
ownerOrgId
!=
$user
->
ownerOrgId
)
{
if
(
empty
(
$parentOrgId
)
&&
$organization
->
orgId
!=
$user
->
ownerOrgId
)
{
continue
;
}
}
if
(
!
isset
(
$organizationByParent
[
$parentOrgId
]))
{
$organizationByParent
[
$parentOrgId
]
=
array
();
}
...
...
src/bundle/recordsManagement/Controller/log.php
View file @
869ef605
...
...
@@ -468,14 +468,17 @@ class log implements archiveDescriptionInterface
return
$path
;
}
public
function
contents
(
$type
,
$archiveId
,
$resourceId
)
{
public
function
contents
(
$type
,
$archiveId
,
$resourceId
)
{
$archiveController
=
\
laabs
::
newController
(
'recordsManagement/archive'
);
$res
=
$archiveController
->
consultation
(
$archiveId
,
$resourceId
);
$stream
=
(
stream_get_contents
(
$res
->
attachment
->
data
));
$journal
=
$type
.
PHP_EOL
;
$journal
.
=
$archiveId
.
','
.
$resourceId
.
PHP_EOL
;
$journal
.
=
base64_decode
(
$res
->
attachment
->
data
)
;
$journal
.
=
$stream
;
return
$journal
;
}
...
...
Write
Preview
Markdown
is supported
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