Merged in bugfix/PMCORE-3624 (pull request #8599)

PMCORE-3624

Approved-by: Fabio Guachalla
Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Martin Laguna
2022-10-05 14:14:06 +00:00
committed by Julio Cesar Laura Avendaño
3 changed files with 29 additions and 14 deletions

View File

@@ -15,7 +15,7 @@
export default { export default {
name: "ChangeLog", name: "ChangeLog",
props: { props: {
data: Object, caseData: Object,
}, },
data() { data() {
return { return {
@@ -26,11 +26,17 @@ export default {
}, },
computed: { computed: {
path() { path() {
if (this.caseData) {
let url = let url =
window.config.SYS_SERVER_AJAX + window.config.SYS_SERVER_AJAX +
window.config.SYS_URI + window.config.SYS_URI +
`cases/ajaxListener?action=changeLogHistory`; `cases/ajaxListener?action=changeLogHistory` +
`&APP_UID=${this.caseData.APP_UID}` +
`&PRO_UID=${this.caseData.PRO_UID}` +
`&TAS_UID=${this.caseData.TAS_UID}`;
return url; return url;
}
return '';
}, },
}, },
mounted() {}, mounted() {},

View File

@@ -18,7 +18,7 @@
<CaseHistory :data="dataCase"> </CaseHistory> <CaseHistory :data="dataCase"> </CaseHistory>
</tab> </tab>
<tab :name="$t('ID_DYNAFORM_HISTORY')"> <tab :name="$t('ID_DYNAFORM_HISTORY')">
<ChangeLog :data="dataCase"> </ChangeLog> <ChangeLog :caseData="dataCase"> </ChangeLog>
</tab> </tab>
</tabs> </tabs>
</div> </div>

View File

@@ -482,12 +482,21 @@ class Ajax
{ {
global $G_PUBLISH; global $G_PUBLISH;
if (isset($_REQUEST['PRO_UID']) && isset($_REQUEST['APP_UID']) && isset($_REQUEST['TAS_UID'])) {
$idHistory = sprintf(
'%s_%s_%s',
$_REQUEST['PRO_UID'],
$_REQUEST['APP_UID'],
$_REQUEST['TAS_UID']
);
} else {
$idHistory = sprintf( $idHistory = sprintf(
'%s_%s_%s', '%s_%s_%s',
$_SESSION['PROCESS'], $_SESSION['PROCESS'],
$_SESSION['APPLICATION'], $_SESSION['APPLICATION'],
$_SESSION['TASK'] $_SESSION['TASK']
); );
}
$oHeadPublisher = headPublisher::getSingleton(); $oHeadPublisher = headPublisher::getSingleton();
$conf = new Configurations(); $conf = new Configurations();