Merge pull request #13491 from colemanw/campaign

Convert Campaign widgets to entityRef

diff --cc CRM/Campaign/Form/Survey/Main.php
index 3429391adb81d176908e65fbd457e475d3916319,e0f7fbdda86088f66ae8fae1d302f523f640eafd..b69ea6602cb068afa347132fb49bb6254fdadf3a
--- 1/CRM/Campaign/Form/Survey/Main.php
--- 2/CRM/Campaign/Form/Survey/Main.php
+++ b/CRM/Campaign/Form/Survey/Main.php
@@@ -124,9 -124,9 +124,8 @@@ class CRM_Campaign_Form_Survey_Main ext
     * Build the form object.
     */
    public function buildQuickForm() {
 -
      $this->add('text', 'title', ts('Title'), CRM_Core_DAO::getAttribute('CRM_Campaign_DAO_Survey', 'title'), TRUE);
  
-     $surveyActivityTypes = CRM_Campaign_BAO_Survey::getSurveyActivityType();
      // Activity Type id
      $this->addSelect('activity_type_id', array('option_url' => 'civicrm/admin/campaign/surveyType'), TRUE);
  

diff --cc CRM/Core/Resources.php
Simple merge

diff --cc js/Common.js
Simple merge