From 9c854386e8230448095ceb52a76de4ba31aa2523 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Sun, 27 Sep 2015 22:38:50 -0400 Subject: [PATCH] Only allow group inline edit when appropriate --- CRM/Contact/BAO/Group.php | 4 +++- CRM/Group/Form/Search.php | 2 ++ templates/CRM/Group/Form/Search.tpl | 6 ++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CRM/Contact/BAO/Group.php b/CRM/Contact/BAO/Group.php index f9b3d84f2b..8ee1f1cd69 100644 --- a/CRM/Contact/BAO/Group.php +++ b/CRM/Contact/BAO/Group.php @@ -870,7 +870,9 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group { ); CRM_Core_DAO::storeValues($object, $values[$object->id]); // Wrap with crm-editable. Not an ideal solution. - $values[$object->id]['title'] = '' . $values[$object->id]['title'] . ''; + if (in_array(CRM_Core_Permission::EDIT, $groupPermissions)) { + $values[$object->id]['title'] = '' . $values[$object->id]['title'] . ''; + } if ($object->saved_search_id) { $values[$object->id]['title'] .= ' (' . ts('Smart Group') . ')'; diff --git a/CRM/Group/Form/Search.php b/CRM/Group/Form/Search.php index e41f5f29b6..ace4b5d081 100644 --- a/CRM/Group/Form/Search.php +++ b/CRM/Group/Form/Search.php @@ -36,6 +36,8 @@ class CRM_Group_Form_Search extends CRM_Core_Form { public function preProcess() { parent::preProcess(); + + CRM_Core_Resources::singleton()->addPermissions('edit groups'); } /** diff --git a/templates/CRM/Group/Form/Search.tpl b/templates/CRM/Group/Form/Search.tpl index 3103b9ca5b..1eeaebdd51 100644 --- a/templates/CRM/Group/Form/Search.tpl +++ b/templates/CRM/Group/Form/Search.tpl @@ -177,8 +177,10 @@ CRM.$(function($) { $(nRow).addClass(cl).attr({id: 'row_' + id, 'data-id': id, 'data-entity': 'group'}); //$('td:eq(0)', nRow).wrapInner(''); $('td:eq(1)', nRow).addClass('right'); - $('td:eq(3)', nRow).wrapInner('
'); - $('td:eq(5)', nRow).wrapInner('
'); + if (CRM.checkPerm('edit groups')) { + $('td:eq(3)', nRow).wrapInner('
'); + $('td:eq(5)', nRow).wrapInner('
'); + } if (parentsOnly) { if ($(nRow).hasClass('crm-group-parent')) { $(nRow).find('td:first').prepend('{/literal}{literal}'); -- 2.25.1