Resolve civicrm#533 by ensuring entity details are correctly loaded f…

…or use by the interactive profile editor
seamuslee001 · Mar 16, 2020 · 202aafe · 202aafe
1 parent 982ece6
commit 202aafe
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/CRM/Volunteer/Angular/Tab/Event.php b/CRM/Volunteer/Angular/Tab/Event.php
@@ -44,6 +44,9 @@ public static function prepareTab($eventId) {
  $event = $project->getEntityAttributes();
  $entityTitle = $event['title'];
 
+ CRM_UF_Page_ProfileEditor::registerProfileScripts();
+ extract(CRM_Volunteer_Form_IncludeProfile::getProfileSelectorTypes());
+ CRM_UF_Page_ProfileEditor::registerSchemas(CRM_Utils_Array::collect('entity_type', $profileEntities));
  CRM_Core_Resources::singleton()
  ->addStyleFile('org.civicrm.volunteer', 'css/volunteer_app.css')
  ->addStyleFile('org.civicrm.volunteer', 'css/volunteer_events.css')
@@ -54,6 +57,11 @@ public static function prepareTab($eventId) {
  'entityId' => $project->entity_id,
  'entityTitle' => $entityTitle,
  'context' => 'eventTab',
+ 'dataGroupType' => CRM_Core_BAO_UFGroup::encodeGroupType($allowCoreTypes, $allowSubTypes, ';;'),
+ 'dataEntities' => json_encode($profileEntities),
+ 'dataDefault' => FALSE,
+ 'dataUsedFor' => json_encode($usedFor),
+
  ));
  }
 

diff --git a/ang/volunteer/Project.html b/ang/volunteer/Project.html
@@ -144,8 +144,8 @@
  <label>{{ts("Profile:")}}</label>
  </div>
  <div class="content">
- <input ng-if="supporting_data.use_profile_editor" crm-profile-selector="{}"
- ng-model="profile.uf_group_id" ng-change="validateProfileSelections()"/>
+ <input ng-if="supporting_data.use_profile_editor"
+ ng-model="profile.uf_group_id" ng-change="validateProfileSelections()" class="crm-profile-selector" id="profile-field" data-entities="{{data_entities}}" data-default="{{data_default}}" data-usedfor="{{data_used_for}}" data-group-type="{{data_group_type}}"/>
 
  <select ng-if="!supporting_data.use_profile_editor" class="big crm-form-select crm-vol-simple-profile-selector"
  crm-ui-select="{placeholder: '', allowClear:true}" ng-change="validateProfileSelections()"

diff --git a/ang/volunteer/Project.js b/ang/volunteer/Project.js
@@ -1,4 +1,4 @@
-(function(angular, $, _) {
+(function(angular, $, _, CRM) {
 
  angular.module('volunteer').config(function($routeProvider) {
  $routeProvider.when('/volunteer/manage/:projectId', {
@@ -176,6 +176,10 @@
  $scope.phone_types = supporting_data.values.phone_types;
  $scope.supporting_data = supporting_data.values;
  $scope.profile_status = profile_status;
+ $scope.data_entities = CRM.vars['org.civicrm.volunteer'].dataEntities;
+ $scope.data_used_for = CRM.vars['org.civicrm.volunteer'].dataUsedFor;
+ $scope.data_default = CRM.vars['org.civicrm.volunteer'].dataDefault;
+ $scope.data_group_type = CRM.vars['org.civicrm.volunteer'].dataGroupType;
  project.is_active = (project.is_active == "1");
  $scope.project = project;
  $scope.profiles = $scope.project.profiles;
@@ -454,4 +458,4 @@
 
  });
 
-})(angular, CRM.$, CRM._);
+})(angular, CRM.$, CRM._, CRM);