projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3230 from monishdeb/CRM-13981
[civicrm-core.git]
/
CRM
/
Event
/
Form
/
ManageEvent.php
diff --git
a/CRM/Event/Form/ManageEvent.php
b/CRM/Event/Form/ManageEvent.php
index 484209bde26d65a7a4360caf0f4f0e89e94f48dc..59da12181321886d17e166ecd4250f845aea5014 100644
(file)
--- a/
CRM/Event/Form/ManageEvent.php
+++ b/
CRM/Event/Form/ManageEvent.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
4
|
+ | CiviCRM version 4.
5
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
3
|
+ | Copyright CiviCRM LLC (c) 2004-201
4
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
3
+ * @copyright CiviCRM LLC (c) 2004-201
4
* $Id$
*
*/
* $Id$
*
*/
@@
-101,7
+101,7
@@
class CRM_Event_Form_ManageEvent extends CRM_Core_Form {
$this->assign('action', $this->_action);
$this->assign('action', $this->_action);
- $this->_id = CRM_Utils_Request::retrieve('id', 'Positive', $this, FALSE);
+ $this->_id = CRM_Utils_Request::retrieve('id', 'Positive', $this, FALSE
, NULL, 'GET'
);
if ($this->_id) {
$this->assign('eventId', $this->_id);
if (empty($this->_addProfileBottom) && empty($this->_addProfileBottomAdd)) {
if ($this->_id) {
$this->assign('eventId', $this->_id);
if (empty($this->_addProfileBottom) && empty($this->_addProfileBottomAdd)) {
@@
-213,7
+213,7
@@
class CRM_Event_Form_ManageEvent extends CRM_Core_Form {
*
* @access public
*
*
* @access public
*
- * @return
None
+ * @return
void
*/
function setDefaultValues() {
$defaults = array();
*/
function setDefaultValues() {
$defaults = array();
@@
-241,7
+241,7
@@
class CRM_Event_Form_ManageEvent extends CRM_Core_Form {
/**
* Function to build the form
*
/**
* Function to build the form
*
- * @return
None
+ * @return
void
* @access public
*/
public function buildQuickForm() {
* @access public
*/
public function buildQuickForm() {
@@
-338,7
+338,7
@@
class CRM_Event_Form_ManageEvent extends CRM_Core_Form {
}
CRM_Core_Session::setStatus(ts("'%1' information has been saved.",
}
CRM_Core_Session::setStatus(ts("'%1' information has been saved.",
- array(1 =>
($subPage == 'friend') ? 'Friend' : $className
)
+ array(1 =>
CRM_Utils_Array::value('title', CRM_Utils_Array::value($subPage, $this->get('tabHeader')), $className)
)
), ts('Saved'), 'success');
$config = CRM_Core_Config::singleton();
), ts('Saved'), 'success');
$config = CRM_Core_Config::singleton();
@@
-350,21
+350,17
@@
class CRM_Event_Form_ManageEvent extends CRM_Core_Form {
CRM_Event_BAO_Event::updateParticipantCampaignID($eventID, $newCampaignID);
}
}
CRM_Event_BAO_Event::updateParticipantCampaignID($eventID, $newCampaignID);
}
}
-
+ $this->postProcessHook();
if ($this->controller->getButtonName('submit') == "_qf_{$className}_upload_done") {
if ($this->_isTemplate) {
if ($this->controller->getButtonName('submit') == "_qf_{$className}_upload_done") {
if ($this->_isTemplate) {
- CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/admin/eventTemplate',
- 'reset=1'
- ));
+ CRM_Core_Session::singleton()->pushUserContext(CRM_Utils_System::url('civicrm/admin/eventTemplate', 'reset=1'));
}
else {
}
else {
- CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/event/manage',
- 'reset=1'
- ));
+ CRM_Core_Session::singleton()->pushUserContext(CRM_Utils_System::url('civicrm/event/manage', 'reset=1'));
}
}
else {
}
}
else {
- CRM_
Utils_System::redirec
t(CRM_Utils_System::url("civicrm/event/manage/{$subPage}",
+ CRM_
Core_Session::singleton()->pushUserContex
t(CRM_Utils_System::url("civicrm/event/manage/{$subPage}",
"action=update&reset=1&id={$this->_id}"
));
}
"action=update&reset=1&id={$this->_id}"
));
}
@@
-372,10
+368,7
@@
class CRM_Event_Form_ManageEvent extends CRM_Core_Form {
}
function getTemplateFileName() {
}
function getTemplateFileName() {
- if ($this->controller->getPrint() == CRM_Core_Smarty::PRINT_NOFORM ||
- $this->getVar('_id') <= 0 ||
- ($this->_action & CRM_Core_Action::DELETE)
- ) {
+ if ($this->controller->getPrint() || $this->getVar('_id') <= 0 || $this->_action & CRM_Core_Action::DELETE) {
return parent::getTemplateFileName();
}
else {
return parent::getTemplateFileName();
}
else {