Donot show Actions until user refreshes the new report

civicrm · Jan 4, 2019 · 89fe49f · 89fe49f
1 parent 3f501e5
commit 89fe49f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
@@ -1571,13 +1571,15 @@ public function addOrderBys() {
   public function buildInstanceAndButtons() {
     CRM_Report_Form_Instance::buildForm($this);
     $this->_actionButtonName = $this->getButtonName('submit');
-    $this->addTaskMenu($this->getActions($this->_id));
+    if ($this->_instanceForm) {
+      $this->addTaskMenu($this->getActions($this->_id));
+    }
 
     $this->assign('instanceForm', $this->_instanceForm);
 
     // CRM-16274 Determine if user has 'edit all contacts' or equivalent
     $permission = CRM_Core_Permission::getPermission();
-    if ($permission == CRM_Core_Permission::EDIT &&
+    if ($this->_instanceForm && $permission == CRM_Core_Permission::EDIT &&
       $this->_add2groupSupported
     ) {
       $this->addElement('select', 'groups', ts('Group'),