From 1a88bdd2567b925851c4de039b6fcf621a2328e9 Mon Sep 17 00:00:00 2001
From: Monish Deb <monish.deb@jmaconsulting.biz>
Date: Wed, 23 Feb 2022 12:54:59 +0530
Subject: [PATCH] Mosaico: loosen restrictions on required fields

---
 ang/crmMosaico/BlockMailing.html | 12 ++++++------
 ang/crmMosaico/SubjectList.js    |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ang/crmMosaico/BlockMailing.html b/ang/crmMosaico/BlockMailing.html
index 23301eb3d9..3300880a7e 100644
--- a/ang/crmMosaico/BlockMailing.html
+++ b/ang/crmMosaico/BlockMailing.html
@@ -1,9 +1,9 @@
 <div ng-form="subform" crm-ui-id-scope>
 
   <div class="form-group-lg">
-    <label for="inputTitle" class="control-label required-mark">{{ts('Mailing Name')}}
+    <label for="inputTitle" ng-class="checkPerm('create mailings') ? 'control-label' : 'control-label required-mark'">{{ts('Mailing Name')}}
       <a crm-ui-help="hs({id: 'name', title: ts('Mailing Name')})"></a></label>
-    <input type="text" class="form-control" id="inputTitle" placeholder="{{ts('Mailing Name')}}" ng-model="mailing.name" required>
+    <input type="text" class="form-control" id="inputTitle" placeholder="{{ts('Mailing Name')}}" ng-model="mailing.name" ng-required="!checkPerm('create mailings')">
   </div>
 
   <div class="form-group" ng-show="crmMailingConst.campaignEnabled">
@@ -19,7 +19,7 @@
   </div>
 
   <div class="form-group">
-    <label for="inputFrom" class="control-label required-mark">{{ts('From')}}
+    <label for="inputFrom" ng-class="checkPerm('create mailings') ? 'control-label' : 'control-label required-mark'">{{ts('From')}}
       <a crm-ui-help="hs({id: 'from_email', title: ts('From')})"></a></label>
     <div ng-controller="EmailAddrCtrl" crm-mailing-from-address="fromPlaceholder" crm-mailing="mailing">
       <select
@@ -54,12 +54,12 @@
   </div>
 
   <div class="form-group">
-    <label for="inputRecipients" class="control-label required-mark">{{ts('Recipients')}}</label>
+    <label for="inputRecipients" ng-class="checkPerm('create mailings') ? 'control-label' : 'control-label required-mark'">{{ts('Recipients')}}</label>
     <div crm-mailing-block-recipients="{name: 'recipients', id: 'subform.recipients'}" crm-mailing="mailing"></div>
   </div>
 
   <div class="form-group">
-    <label for="inputSubject" class="control-label required-mark">{{ts('Subject')}}</label>
+    <label for="inputSubject" ng-class="checkPerm('create mailings') ? 'control-label' : 'control-label required-mark'">{{ts('Subject')}}</label>
     <div>
       <crm-mosaico-subject-list crm-mailing="mailing" />
     </div>
@@ -85,7 +85,7 @@
   </span>
 
   <div class="form-group" ng-if="crmMailingConst.isMultiLingual">
-    <label for="inputLanguage" class="control-label required-mark">{{ts('Language')}}</label>
+    <label for="inputLanguage" ng-class="checkPerm('create mailings') ? 'control-label' : 'control-label required-mark'">{{ts('Language')}}</label>
     <select
         id="inputLanguage"
         name="language"
diff --git a/ang/crmMosaico/SubjectList.js b/ang/crmMosaico/SubjectList.js
index 795499e513..d5ca3a7e72 100644
--- a/ang/crmMosaico/SubjectList.js
+++ b/ang/crmMosaico/SubjectList.js
@@ -12,6 +12,7 @@
         });
         scope.ts = CRM.ts(null);
         scope.hs = crmUiHelp({file: 'CRM/Mailing/MailingUI'});
+        scope.checkPerm = CRM.checkPerm;
 
         scope.addSubj = function addSubj() {
           scope.mailing.template_options.variants = [