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 #4009 from eileenmcnaughton/CRM-15210
[civicrm-core.git]
/
CRM
/
Core
/
Page
/
Basic.php
diff --git
a/CRM/Core/Page/Basic.php
b/CRM/Core/Page/Basic.php
index 3c7a441f8c85725f95c2aff5176d8c49d364e963..e779d3037828506e50ff8b282684cd38dbf30fed 100644
(file)
--- a/
CRM/Core/Page/Basic.php
+++ b/
CRM/Core/Page/Basic.php
@@
-1,7
+1,7
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
3
|
+ | CiviCRM version 4.
4
|
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2013 |
+--------------------------------------------------------------------+
@@
-263,7
+263,7
@@
abstract class CRM_Core_Page_Basic extends CRM_Core_Page {
$this->action($object, $action, $values[$object->id], $links, $permission);
if (isset($object->mapping_type_id)) {
$this->action($object, $action, $values[$object->id], $links, $permission);
if (isset($object->mapping_type_id)) {
- $mappintTypes = CRM_Core_PseudoConstant::
mappingTypes(
);
+ $mappintTypes = CRM_Core_PseudoConstant::
get('CRM_Core_DAO_Mapping', 'mapping_type_id'
);
$values[$object->id]['mapping_type'] = $mappintTypes[$object->mapping_type_id];
}
}
$values[$object->id]['mapping_type'] = $mappintTypes[$object->mapping_type_id];
}
}
@@
-307,7
+307,14
@@
abstract class CRM_Core_Page_Basic extends CRM_Core_Page {
$values['class'] = 'reserved';
// check if object is relationship type
$object_type = get_class($object);
$values['class'] = 'reserved';
// check if object is relationship type
$object_type = get_class($object);
- if ($object_type == 'CRM_Contact_BAO_RelationshipType' || $object_type == 'CRM_Core_BAO_LocationType') {
+
+ $exceptions = array(
+ 'CRM_Contact_BAO_RelationshipType',
+ 'CRM_Core_BAO_LocationType',
+ 'CRM_Badge_BAO_Layout',
+ );
+
+ if (in_array($object_type, $exceptions)) {
$newAction = CRM_Core_Action::VIEW + CRM_Core_Action::UPDATE;
}
else {
$newAction = CRM_Core_Action::VIEW + CRM_Core_Action::UPDATE;
}
else {