Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Maarch
maarchRM
Commits
13238990
Unverified
Commit
13238990
authored
Jul 22, 2020
by
Jerome Boucher
Browse files
fix/14312 : add count with max results on register view
parent
4cbe2e3a
Pipeline
#8801
failed with stage
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/bundle/recordsManagement/Controller/log.php
View file @
13238990
...
...
@@ -168,7 +168,7 @@ class log implements archiveDescriptionInterface
*/
public
function
count
(
$description
=
null
,
$text
=
null
,
array
$args
=
[],
$checkAccess
=
null
,
$maxResults
=
null
)
{
return
count
(
$this
->
search
(
$description
,
$text
,
$args
,
$checkAccess
,
$maxResults
=
null
);
return
count
(
$this
->
search
(
$description
,
$text
,
$args
,
$checkAccess
,
$maxResults
=
null
)
)
;
}
/**
...
...
@@ -306,7 +306,7 @@ class log implements archiveDescriptionInterface
}
else
{
$query
=
"type='
$type
' AND ownerOrgRegNumber = null"
;
}
$journals
=
$this
->
sdoFactory
->
find
(
'recordsManagement/log'
,
$query
,
[],
">toDate"
,
0
,
1
);
if
(
empty
(
$journals
))
{
...
...
@@ -412,7 +412,7 @@ class log implements archiveDescriptionInterface
// Create timestamp resource
$timestampResource
=
$digitalResourceController
->
createFromFile
(
$timestampFileName
);
$digitalResourceController
->
getHash
(
$timestampResource
,
"SHA256"
);
$logMessage
=
[
"message"
=>
"Timestamp file generated"
];
\
laabs
::
notify
(
\
bundle\audit\AUDIT_ENTRY_OUTPUT
,
$logMessage
);
...
...
src/bundle/recordsManagement/archivesInterface.php
View file @
13238990
...
...
@@ -85,9 +85,6 @@ interface archivesInterface
$maxResults
=
null
);
/*
RETRIEVE ARCHIVES
*/
/**
* Count archives by profile / dates / agreement
*
...
...
src/presentation/maarchRM/Presenter/recordsManagement/archive.php
View file @
13238990
...
...
@@ -115,11 +115,12 @@ class archive
/**
* get archives with information
* @param array $archives Array of archive object
* @param array $archives Array of archive object
* @param integer $count Count of archive object without limit
*
* @return string
*/
public
function
search
(
$archives
)
public
function
search
(
$archives
,
$count
)
{
$this
->
view
->
addContentFile
(
"recordsManagement/archive/resultList.html"
);
...
...
@@ -222,6 +223,7 @@ class archive
$this
->
view
->
setSource
(
'hasReachMaxResults'
,
$hasReachMaxResults
);
$this
->
view
->
setSource
(
'maxResults'
,
\
laabs
::
configuration
(
'presentation.maarchRM'
)[
'maxResults'
]);
$this
->
view
->
setSource
(
'totalResultsWithoutLimit'
,
$count
);
$this
->
view
->
setSource
(
"accessRules"
,
$accessRules
);
$this
->
view
->
setSource
(
"retentionRules"
,
$retentionRules
);
$this
->
view
->
setSource
(
'archive'
,
$archives
);
...
...
src/presentation/maarchRM/UserStory/archiveManagement/retrieveInterface.php
View file @
13238990
...
...
@@ -57,6 +57,7 @@ interface retrieveInterface
/**
* Search archives by profile / dates / agreement
*
* @param string $archiveId
* @param string $profileReference
* @param string $status
...
...
@@ -69,8 +70,10 @@ interface retrieveInterface
* @param string $text
* @param integer $maxResults
*
* @return recordsManagement/archive/search
* @uses recordsManagement/archives/read
* @uses recordsManagement/archives/readCount
*
* @return recordsManagement/archive/search
*/
public
function
readRecordsmanagementArchives
(
$archiveId
=
null
,
...
...
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!
Cancel
Please
register
or
sign in
to comment