From 28f0acefdb778fd5b054e1afbc14a2ad08da6ecc Mon Sep 17 00:00:00 2001 From: anonymoususer72041 <247563575+anonymoususer72041@users.noreply.github.com> Date: Fri, 8 May 2026 13:48:03 +0200 Subject: [PATCH 1/5] Add shared activity schedule event modal --- .../AddActivityScheduleEventModal.tpl | 263 ++++++++++++++++++ 1 file changed, 263 insertions(+) create mode 100644 modules/activity/AddActivityScheduleEventModal.tpl diff --git a/modules/activity/AddActivityScheduleEventModal.tpl b/modules/activity/AddActivityScheduleEventModal.tpl new file mode 100644 index 000000000..ee5ed23d7 --- /dev/null +++ b/modules/activity/AddActivityScheduleEventModal.tpl @@ -0,0 +1,263 @@ + +onlyScheduleEvent): ?> + activityParentModuleLabel, array($this->activityValidatorPath, 'js/activity.js'), $this->activityParentModuleLabel . ': Schedule Event'); ?> + + activityParentModuleLabel, array($this->activityValidatorPath, 'js/activity.js'), $this->activityParentModuleLabel . ': Log Activity'); ?> + + +isFinishedMode): ?> + + + +
+ + +activityRegardingIDHidden): ?> + + + + +onlyScheduleEvent): ?> + + + + + + + + + + + + onlyScheduleEvent): ?>style="display:none;"> + + + + + onlyScheduleEvent): ?>style="display:none;"> + + + + + + + + + +
+ + + +
+ + +   +   + +
+ + +activityRegardingIDHidden): ?> + _($this->activityRegardingTitle); ?> + + + +
+ + + onlyScheduleEvent): ?> checked="checked" onclick="AS_onAddActivityChange('addActivity', 'activityTypeID', 'activityNote', 'addActivitySpanA', 'addActivitySpanB');" />Log an Activity
+
+ Activity Type
+
+ Activity Notes
+ +
+
+ + + onlyScheduleEvent): ?> checked="checked" />onlyScheduleEvent): ?>Schedule Event +
onlyScheduleEvent): ?>style="display:none;"> + + + + + + +
+
+ +
+ +
+ +
+ +
+ +   +   + +
+ +
+ All Day / No Specific Time
+
+ +
+ Public Entry +
+ 		+
+
+ +
+ +activityShowEventDuration): ?> +
+ +
+ +
+ + +
+
+ +
+ +
allowEventReminders): ?>style="display:none;"> +  
+
+ + +
+
+
+   + +
+ + + + + changesMade): ?> +

No changes have been made.

+ + onlyScheduleEvent): ?> + activityAdded): ?> + activityDescription)): ?> +

An activity entry of type _($this->activityType); ?> has been added with the following note: "activityDescription); ?>".

+ +

An activity entry of type _($this->activityType); ?> has been added with no notes.

+ + +

No activity entries have been added.

+ + + + + eventHTML); ?> + +
+ +
+ + + + From 05fd046bbb758963a552d867eedf44e85df5cadc Mon Sep 17 00:00:00 2001 From: anonymoususer72041 <247563575+anonymoususer72041@users.noreply.github.com> Date: Fri, 8 May 2026 13:48:38 +0200 Subject: [PATCH 2/5] Use shared activity schedule event modal for contacts --- modules/contacts/ContactsUI.php | 43 +++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/modules/contacts/ContactsUI.php b/modules/contacts/ContactsUI.php index a84257f82..979f22224 100755 --- a/modules/contacts/ContactsUI.php +++ b/modules/contacts/ContactsUI.php @@ -1107,6 +1107,10 @@ private function addActivityScheduleEvent() $contactData = $contacts->get($contactID); $regardingRS = $contacts->getJobOrdersArray($contactID); + foreach ($regardingRS as $rowIndex => $regardingData) + { + $regardingRS[$rowIndex]['activityLabel'] = $regardingData['title']; + } $calendar = new Calendar($this->_siteID); $calendarEventTypes = $calendar->getAllEventTypes(); @@ -1126,14 +1130,32 @@ private function addActivityScheduleEvent() } $this->_template->assign('contactID', $contactID); + $this->_template->assign('activityParentModule', 'contacts'); + $this->_template->assign('activityParentModuleLabel', 'Contacts'); + $this->_template->assign('activityParentIDName', 'contactID'); + $this->_template->assign('activityParentID', $contactID); + $this->_template->assign('activitySubmitAction', 'addActivityScheduleEvent'); + $this->_template->assign('activityValidatorPath', 'modules/contacts/activityvalidator.js'); + $this->_template->assign('activityRegardingIDHidden', false); + $this->_template->assign('activityRegardingTitle', ''); + $this->_template->assign('activityTitleWidth', 150); + $this->_template->assign('activityDescriptionWidth', 150); + $this->_template->assign('activityDescriptionHeight', 0); + $this->_template->assign('activityShowEventDuration', false); + $this->_template->assign('activityReminderEmailLabel', 'Email To:'); + $this->_template->assign('activityFocusEventTitle', true); + $this->_template->assign('activityCancelURL', CATSUtility::getIndexName() . '?m=contacts&a=show&contactID=' . $contactID); + $this->_template->assign('activityCloseURL', CATSUtility::getIndexName() . '?m=contacts&a=show&contactID=' . $contactID); $this->_template->assign('regardingRS', $regardingRS); + $this->_template->assign('jobOrdersRS', $regardingRS); + $this->_template->assign('regardingID', -1); $this->_template->assign('allowEventReminders', $allowEventReminders); $this->_template->assign('userEmail', $_SESSION['CATS']->getEmail()); $this->_template->assign('onlyScheduleEvent', $onlyScheduleEvent); $this->_template->assign('calendarEventTypes', $calendarEventTypes); $this->_template->assign('isFinishedMode', false); $this->_template->display( - './modules/contacts/AddActivityScheduleEventModal.tpl' + './modules/activity/AddActivityScheduleEventModal.tpl' ); } @@ -1601,6 +1623,23 @@ private function _addActivityScheduleEvent($regardingID, $directoryOverride = '' if (!eval(Hooks::get('CANDIDATE_ON_ADD_ACTIVITY_CHANGE_STATUS_POST'))) return; $this->_template->assign('contactID', $contactID); + $this->_template->assign('activityParentModule', 'contacts'); + $this->_template->assign('activityParentModuleLabel', 'Contacts'); + $this->_template->assign('activityParentIDName', 'contactID'); + $this->_template->assign('activityParentID', $contactID); + $this->_template->assign('activitySubmitAction', 'addActivityScheduleEvent'); + $this->_template->assign('activityValidatorPath', 'modules/contacts/activityvalidator.js'); + $this->_template->assign('activityRegardingIDHidden', false); + $this->_template->assign('activityRegardingTitle', ''); + $this->_template->assign('activityTitleWidth', 150); + $this->_template->assign('activityDescriptionWidth', 150); + $this->_template->assign('activityDescriptionHeight', 0); + $this->_template->assign('activityShowEventDuration', false); + $this->_template->assign('activityReminderEmailLabel', 'Email To:'); + $this->_template->assign('activityFocusEventTitle', true); + $this->_template->assign('activityCancelURL', CATSUtility::getIndexName() . '?m=contacts&a=show&contactID=' . $contactID); + $this->_template->assign('activityCloseURL', CATSUtility::getIndexName() . '?m=contacts&a=show&contactID=' . $contactID); + $this->_template->assign('jobOrdersRS', array()); $this->_template->assign('regardingID', $regardingID); $this->_template->assign('activityAdded', $activityAdded); $this->_template->assign('activityDescription', $activityNote); @@ -1611,7 +1650,7 @@ private function _addActivityScheduleEvent($regardingID, $directoryOverride = '' $this->_template->assign('changesMade', $changesMade); $this->_template->assign('isFinishedMode', true); $this->_template->display( - './modules/contacts/AddActivityScheduleEventModal.tpl' + './modules/activity/AddActivityScheduleEventModal.tpl' ); } } From 99d48936f085e1aec89a1294085744520a544ad5 Mon Sep 17 00:00:00 2001 From: anonymoususer72041 <247563575+anonymoususer72041@users.noreply.github.com> Date: Fri, 8 May 2026 13:49:14 +0200 Subject: [PATCH 3/5] Use shared activity schedule event modal for candidates --- modules/candidates/CandidatesUI.php | 51 +++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/modules/candidates/CandidatesUI.php b/modules/candidates/CandidatesUI.php index 78383a35c..9d0d0a152 100755 --- a/modules/candidates/CandidatesUI.php +++ b/modules/candidates/CandidatesUI.php @@ -1806,6 +1806,10 @@ private function addActivity() $pipelines = new Pipelines($this->_siteID); $pipelineRS = $pipelines->getCandidatePipeline($candidateID); + foreach ($pipelineRS as $rowIndex => $pipelineData) + { + $pipelineRS[$rowIndex]['activityLabel'] = $pipelineData['title'] . ' (' . $pipelineData['companyName'] . ')'; + } /* Are we in "Only Schedule Event" mode? */ $onlyScheduleEvent = $this->isChecked('onlyScheduleEvent', $_GET); @@ -1825,8 +1829,26 @@ private function addActivity() } $this->_template->assign('candidateID', $candidateID); + $this->_template->assign('activityParentModule', 'candidates'); + $this->_template->assign('activityParentModuleLabel', 'Candidates'); + $this->_template->assign('activityParentIDName', 'candidateID'); + $this->_template->assign('activityParentID', $candidateID); + $this->_template->assign('activitySubmitAction', 'addActivity'); + $this->_template->assign('activityValidatorPath', 'modules/candidates/activityvalidator.js'); + $this->_template->assign('activityRegardingIDHidden', false); + $this->_template->assign('activityRegardingTitle', ''); + $this->_template->assign('activityTitleWidth', 180); + $this->_template->assign('activityDescriptionWidth', 180); + $this->_template->assign('activityDescriptionHeight', 60); + $this->_template->assign('activityShowEventDuration', true); + $this->_template->assign('activityReminderEmailLabel', 'E-Mail To:'); + $this->_template->assign('activityFocusEventTitle', false); + $this->_template->assign('activityCancelURL', CATSUtility::getIndexName() . '?m=candidates&a=show&candidateID=' . $candidateID); + $this->_template->assign('activityCloseURL', CATSUtility::getIndexName() . '?m=candidates&a=show&candidateID=' . $candidateID); + $this->_template->assign('jobOrdersRS', $pipelineRS); $this->_template->assign('pipelineRS', $pipelineRS); $this->_template->assign('selectedJobOrderID', $selectedJobOrderID); + $this->_template->assign('regardingID', $selectedJobOrderID); $this->_template->assign('allowEventReminders', $allowEventReminders); $this->_template->assign('userEmail', $_SESSION['CATS']->getEmail()); $this->_template->assign('calendarEventTypes', $calendarEventTypes); @@ -1834,7 +1856,7 @@ private function addActivity() $this->_template->assign('isFinishedMode', false); $this->_template->assign('isJobOrdersMode', false); $this->_template->display( - './modules/candidates/AddActivityScheduleEventModal.tpl' + './modules/activity/AddActivityScheduleEventModal.tpl' ); } @@ -3393,6 +3415,31 @@ private function _addActivity($isJobOrdersMode, $regardingID, if (!eval(Hooks::get('CANDIDATE_ON_ADD_ACTIVITY_CHANGE_STATUS_POST'))) return; $this->_template->assign('candidateID', $candidateID); + $this->_template->assign('activityParentModule', ($isJobOrdersMode ? 'joborders' : 'candidates')); + $this->_template->assign('activityParentModuleLabel', ($isJobOrdersMode ? 'Job Orders' : 'Candidates')); + $this->_template->assign('activityParentIDName', 'candidateID'); + $this->_template->assign('activityParentID', $candidateID); + $this->_template->assign('activitySubmitAction', 'addActivity'); + $this->_template->assign('activityValidatorPath', 'modules/candidates/activityvalidator.js'); + $this->_template->assign('activityRegardingIDHidden', $isJobOrdersMode); + $this->_template->assign('activityRegardingTitle', ($isJobOrdersMode ? $pipelineData['title'] : '')); + $this->_template->assign('activityTitleWidth', 180); + $this->_template->assign('activityDescriptionWidth', 180); + $this->_template->assign('activityDescriptionHeight', 60); + $this->_template->assign('activityShowEventDuration', true); + $this->_template->assign('activityReminderEmailLabel', 'E-Mail To:'); + $this->_template->assign('activityFocusEventTitle', false); + if ($isJobOrdersMode) + { + $this->_template->assign('activityCancelURL', CATSUtility::getIndexName() . '?m=joborders&a=show&jobOrderID=' . $selectedJobOrderID); + $this->_template->assign('activityCloseURL', CATSUtility::getIndexName() . '?m=joborders&a=show&jobOrderID=' . $regardingID); + } + else + { + $this->_template->assign('activityCancelURL', CATSUtility::getIndexName() . '?m=candidates&a=show&candidateID=' . $candidateID); + $this->_template->assign('activityCloseURL', CATSUtility::getIndexName() . '?m=candidates&a=show&candidateID=' . $candidateID); + } + $this->_template->assign('jobOrdersRS', array()); $this->_template->assign('regardingID', $regardingID); $this->_template->assign('activityAdded', $activityAdded); $this->_template->assign('activityDescription', htmlspecialchars($activityNote, ENT_QUOTES | ENT_SUBSTITUTE, HTML_ENCODING)); @@ -3404,7 +3451,7 @@ private function _addActivity($isJobOrdersMode, $regardingID, $this->_template->assign('isFinishedMode', true); $this->_template->assign('isJobOrdersMode', $isJobOrdersMode); $this->_template->display( - './modules/candidates/AddActivityScheduleEventModal.tpl' + './modules/activity/AddActivityScheduleEventModal.tpl' ); } From a6b824c315bf7403a295d7929d87992789c1eb93 Mon Sep 17 00:00:00 2001 From: anonymoususer72041 <247563575+anonymoususer72041@users.noreply.github.com> Date: Fri, 8 May 2026 13:53:44 +0200 Subject: [PATCH 4/5] Remove duplicated activity schedule event modal templates --- .../AddActivityScheduleEventModal.tpl | 267 ------------------ .../AddActivityScheduleEventModal.tpl | 233 --------------- modules/joborders/JobOrdersUI.php | 20 +- 3 files changed, 19 insertions(+), 501 deletions(-) delete mode 100644 modules/candidates/AddActivityScheduleEventModal.tpl delete mode 100755 modules/contacts/AddActivityScheduleEventModal.tpl diff --git a/modules/candidates/AddActivityScheduleEventModal.tpl b/modules/candidates/AddActivityScheduleEventModal.tpl deleted file mode 100644 index 8ff43a358..000000000 --- a/modules/candidates/AddActivityScheduleEventModal.tpl +++ /dev/null @@ -1,267 +0,0 @@ - -isJobOrdersMode && $this->onlyScheduleEvent): ?> - -isJobOrdersMode): ?> - -onlyScheduleEvent): ?> - - - - - -isFinishedMode): ?> - - - -
- - -isJobOrdersMode): ?> - - - - -onlyScheduleEvent): ?> - - - - - - - - - - - - onlyScheduleEvent): ?>style="display:none;"> - - - - - onlyScheduleEvent): ?>style="display:none;"> - - - - - - - - - -
- - - -
- - -   -   - -
- - -isJobOrdersMode): ?> - _($this->pipelineData['title']); ?> - - - -
- - - onlyScheduleEvent): ?> checked="checked" onclick="AS_onAddActivityChange('addActivity', 'activityTypeID', 'activityNote', 'addActivitySpanA', 'addActivitySpanB');" />Log an Activity
-
- Activity Type
-
- Activity Notes
- -
-
- - - onlyScheduleEvent): ?> checked="checked" />onlyScheduleEvent): ?>Schedule Event -
onlyScheduleEvent): ?>style="display:none;"> - - - - - - -
-
- -
- -
- -
- -
- -   -   - -
- -
- All Day / No Specific Time
-
- -
- Public Entry -
- 		-
-
- -
- -
- -
- -
- -
-
- -
- -
allowEventReminders): ?>style="display:none;"> -  
-
- - -
-
-
-   -isJobOrdersMode): ?> - - - - -
- - - - - changesMade): ?> -

No changes have been made.

- - onlyScheduleEvent): ?> - activityAdded): ?> - activityDescription)): ?> -

An activity entry of type _($this->activityType); ?> has been added with the following note: "activityDescription); ?>".

- -

An activity entry of type _($this->activityType); ?> has been added with no notes.

- - -

No activity entries have been added.

- - - - - eventHTML); ?> - -
-isJobOrdersMode): ?> - - - - -
- - - - diff --git a/modules/contacts/AddActivityScheduleEventModal.tpl b/modules/contacts/AddActivityScheduleEventModal.tpl deleted file mode 100755 index e2a1cedd8..000000000 --- a/modules/contacts/AddActivityScheduleEventModal.tpl +++ /dev/null @@ -1,233 +0,0 @@ - - -onlyScheduleEvent): ?> - - - - - -isFinishedMode): ?> - - - -
- - - - - onlyScheduleEvent): ?> - - - - - - - - - - - - onlyScheduleEvent): ?>style="display:none;"> - - - - - onlyScheduleEvent): ?>style="display:none;"> - - - - - - - - - -
- - - -
- - -   -   - -
- - - -
- - - onlyScheduleEvent): ?>checked onclick="AS_onAddActivityChange('addActivity', 'activityTypeID', 'activityNote', 'addActivitySpanA', 'addActivitySpanB');" />Log an Activity
-
- Activity Type
-
- Activity Notes
- -
-
- - - onlyScheduleEvent): ?>checked/>onlyScheduleEvent): ?>Schedule Event -
- - - - - - -
-
- -
- -
- -
- -
- -   -   - -
- -
- All Day / No Specific Time
-
- -
- Public Entry -
- 		-
-
- -
-
-
- -
- -
allowEventReminders): ?>style="display:none;"> -  
-
- - -
-
-
-   - -
- - - - - changesMade): ?> -

No changes have been made.

- - onlyScheduleEvent): ?> - activityAdded): ?> - activityDescription)): ?> -

An activity entry of type _($this->activityType); ?> has been added with the following note: "activityDescription); ?>".

- -

An activity entry of type _($this->activityType); ?> has been added with no notes.

- - -

No activity entries have been added.

- - - - - eventHTML); ?> - -
- -
- - - - diff --git a/modules/joborders/JobOrdersUI.php b/modules/joborders/JobOrdersUI.php index 8fd8fce5c..0849ba595 100755 --- a/modules/joborders/JobOrdersUI.php +++ b/modules/joborders/JobOrdersUI.php @@ -1515,6 +1515,24 @@ private function addActivity() $this->_template->assign('candidateID', $candidateID); $this->_template->assign('pipelineData', $pipelineData); $this->_template->assign('selectedJobOrderID', $jobOrderID); + $this->_template->assign('activityParentModule', 'joborders'); + $this->_template->assign('activityParentModuleLabel', 'Job Orders'); + $this->_template->assign('activityParentIDName', 'candidateID'); + $this->_template->assign('activityParentID', $candidateID); + $this->_template->assign('activitySubmitAction', 'addActivity'); + $this->_template->assign('activityValidatorPath', 'modules/candidates/activityvalidator.js'); + $this->_template->assign('activityRegardingIDHidden', true); + $this->_template->assign('activityRegardingTitle', $pipelineData['title']); + $this->_template->assign('activityTitleWidth', 180); + $this->_template->assign('activityDescriptionWidth', 180); + $this->_template->assign('activityDescriptionHeight', 60); + $this->_template->assign('activityShowEventDuration', true); + $this->_template->assign('activityReminderEmailLabel', 'E-Mail To:'); + $this->_template->assign('activityFocusEventTitle', false); + $this->_template->assign('activityCancelURL', CATSUtility::getIndexName() . '?m=joborders&a=show&jobOrderID=' . $jobOrderID); + $this->_template->assign('activityCloseURL', CATSUtility::getIndexName() . '?m=joborders&a=show&jobOrderID=' . $jobOrderID); + $this->_template->assign('jobOrdersRS', array()); + $this->_template->assign('regardingID', $jobOrderID); $this->_template->assign('calendarEventTypes', $calendarEventTypes); $this->_template->assign('allowEventReminders', $allowEventReminders); $this->_template->assign('userEmail', $_SESSION['CATS']->getEmail()); @@ -1525,7 +1543,7 @@ private function addActivity() if (!eval(Hooks::get('JO_ADD_ACTIVITY_CHANGE_STATUS'))) return; $this->_template->display( - './modules/candidates/AddActivityScheduleEventModal.tpl' + './modules/activity/AddActivityScheduleEventModal.tpl' ); } From 655bd65dd1bfa4e3a079b94c3cbc5a680b67d3bc Mon Sep 17 00:00:00 2001 From: anonymoususer72041 <247563575+anonymoususer72041@users.noreply.github.com> Date: Fri, 8 May 2026 13:54:27 +0200 Subject: [PATCH 5/5] Normalize activity modal template variables --- modules/activity/AddActivityScheduleEventModal.tpl | 4 ++-- modules/candidates/CandidatesUI.php | 10 +++++----- modules/contacts/ContactsUI.php | 6 +++--- modules/joborders/JobOrdersUI.php | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/activity/AddActivityScheduleEventModal.tpl b/modules/activity/AddActivityScheduleEventModal.tpl index ee5ed23d7..d328d6126 100644 --- a/modules/activity/AddActivityScheduleEventModal.tpl +++ b/modules/activity/AddActivityScheduleEventModal.tpl @@ -1,8 +1,8 @@ onlyScheduleEvent): ?> - activityParentModuleLabel, array($this->activityValidatorPath, 'js/activity.js'), $this->activityParentModuleLabel . ': Schedule Event'); ?> + activityModalTitle, array($this->activityValidatorPath, 'js/activity.js'), $this->activityModalTitle . ': Schedule Event'); ?> - activityParentModuleLabel, array($this->activityValidatorPath, 'js/activity.js'), $this->activityParentModuleLabel . ': Log Activity'); ?> + activityModalTitle, array($this->activityValidatorPath, 'js/activity.js'), $this->activityModalTitle . ': Log Activity'); ?> isFinishedMode): ?> diff --git a/modules/candidates/CandidatesUI.php b/modules/candidates/CandidatesUI.php index 9d0d0a152..411356bb5 100755 --- a/modules/candidates/CandidatesUI.php +++ b/modules/candidates/CandidatesUI.php @@ -1830,7 +1830,7 @@ private function addActivity() $this->_template->assign('candidateID', $candidateID); $this->_template->assign('activityParentModule', 'candidates'); - $this->_template->assign('activityParentModuleLabel', 'Candidates'); + $this->_template->assign('activityModalTitle', 'Candidates'); $this->_template->assign('activityParentIDName', 'candidateID'); $this->_template->assign('activityParentID', $candidateID); $this->_template->assign('activitySubmitAction', 'addActivity'); @@ -3124,7 +3124,7 @@ private function _addCandidate($isModal, $directoryOverride = '') /** * Processes an Add Activity form and displays - * candidates/AddActivityScheduleEventModal.tpl. + * activity/AddActivityScheduleEventModal.tpl. * * @param boolean from joborders module perspective * @param integer "regarding" job order ID or -1 @@ -3416,13 +3416,13 @@ private function _addActivity($isJobOrdersMode, $regardingID, $this->_template->assign('candidateID', $candidateID); $this->_template->assign('activityParentModule', ($isJobOrdersMode ? 'joborders' : 'candidates')); - $this->_template->assign('activityParentModuleLabel', ($isJobOrdersMode ? 'Job Orders' : 'Candidates')); + $this->_template->assign('activityModalTitle', ($isJobOrdersMode ? 'Job Orders' : 'Candidates')); $this->_template->assign('activityParentIDName', 'candidateID'); $this->_template->assign('activityParentID', $candidateID); $this->_template->assign('activitySubmitAction', 'addActivity'); $this->_template->assign('activityValidatorPath', 'modules/candidates/activityvalidator.js'); $this->_template->assign('activityRegardingIDHidden', $isJobOrdersMode); - $this->_template->assign('activityRegardingTitle', ($isJobOrdersMode ? $pipelineData['title'] : '')); + $this->_template->assign('activityRegardingTitle', ''); $this->_template->assign('activityTitleWidth', 180); $this->_template->assign('activityDescriptionWidth', 180); $this->_template->assign('activityDescriptionHeight', 60); @@ -3431,7 +3431,7 @@ private function _addActivity($isJobOrdersMode, $regardingID, $this->_template->assign('activityFocusEventTitle', false); if ($isJobOrdersMode) { - $this->_template->assign('activityCancelURL', CATSUtility::getIndexName() . '?m=joborders&a=show&jobOrderID=' . $selectedJobOrderID); + $this->_template->assign('activityCancelURL', CATSUtility::getIndexName() . '?m=joborders&a=show&jobOrderID=' . $regardingID); $this->_template->assign('activityCloseURL', CATSUtility::getIndexName() . '?m=joborders&a=show&jobOrderID=' . $regardingID); } else diff --git a/modules/contacts/ContactsUI.php b/modules/contacts/ContactsUI.php index 979f22224..8ed03f404 100755 --- a/modules/contacts/ContactsUI.php +++ b/modules/contacts/ContactsUI.php @@ -1131,7 +1131,7 @@ private function addActivityScheduleEvent() $this->_template->assign('contactID', $contactID); $this->_template->assign('activityParentModule', 'contacts'); - $this->_template->assign('activityParentModuleLabel', 'Contacts'); + $this->_template->assign('activityModalTitle', 'Contacts'); $this->_template->assign('activityParentIDName', 'contactID'); $this->_template->assign('activityParentID', $contactID); $this->_template->assign('activitySubmitAction', 'addActivityScheduleEvent'); @@ -1336,7 +1336,7 @@ private function _formatListByViewResults($resultSet) /** * Processes an Add Activity / Schedule Event form and displays - * contacts/AddActivityScheduleEventModal.tpl. This is factored out + * activity/AddActivityScheduleEventModal.tpl. This is factored out * for code clarity. * * @param boolean from joborders module perspective @@ -1624,7 +1624,7 @@ private function _addActivityScheduleEvent($regardingID, $directoryOverride = '' $this->_template->assign('contactID', $contactID); $this->_template->assign('activityParentModule', 'contacts'); - $this->_template->assign('activityParentModuleLabel', 'Contacts'); + $this->_template->assign('activityModalTitle', 'Contacts'); $this->_template->assign('activityParentIDName', 'contactID'); $this->_template->assign('activityParentID', $contactID); $this->_template->assign('activitySubmitAction', 'addActivityScheduleEvent'); diff --git a/modules/joborders/JobOrdersUI.php b/modules/joborders/JobOrdersUI.php index 0849ba595..4d878b022 100755 --- a/modules/joborders/JobOrdersUI.php +++ b/modules/joborders/JobOrdersUI.php @@ -1516,7 +1516,7 @@ private function addActivity() $this->_template->assign('pipelineData', $pipelineData); $this->_template->assign('selectedJobOrderID', $jobOrderID); $this->_template->assign('activityParentModule', 'joborders'); - $this->_template->assign('activityParentModuleLabel', 'Job Orders'); + $this->_template->assign('activityModalTitle', 'Job Orders'); $this->_template->assign('activityParentIDName', 'candidateID'); $this->_template->assign('activityParentID', $candidateID); $this->_template->assign('activitySubmitAction', 'addActivity');