Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove template field if using Mosaico in non shoreditch mode #14927

Merged

Conversation

seamuslee001
Copy link
Contributor

Overview

This aims to accomplish something akin to what @agileware-pengyi was aiming to do in veda-consulting-company/uk.co.vedaconsulting.mosaico#322. This does this by only showing the template field if the template_type is traditional

Before

Template field shown even if using Mosaico Template but not using shoreditch

After

Template field hidden in Mosicao

ping @eileenmcnaughton @agileware-pengyi @totten

@civibot
Copy link

civibot bot commented Jul 30, 2019

(Standard links)

@jusfreeman
Copy link
Contributor

jusfreeman commented Jul 31, 2019

This follows our work for Agileware Ref: CIVIMOSAIC-18 - Pengyi will review and provide feedback in the next couple of days.

Copy link
Contributor

@agileware-pengyi agileware-pengyi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe missing a = in the ngif?

ang/crmMailing/BlockMailing.html Outdated Show resolved Hide resolved
<option ng-repeat="frm in crmMsgTemplates.getAll() | orderBy:'msg_title'" ng-value="frm.id">{{frm.msg_title}}</option>
</select>
<a crm-icon="fa-floppy-o" ng-click="saveTemplate(abtest.mailings.a)" class="crm-hover-button" title="{{ts('Save As')}}"></a>
<div ng-if="abtest.mailings.a.template_type='traditional'">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And here if yes.

@eileenmcnaughton
Copy link
Contributor

@agileware-pengyi does this require changes from your testing? Comment above suggests you maybe haven't tested but are are more 'discussing' the code?

@agileware-pengyi
Copy link
Contributor

@eileenmcnaughton @seamuslee001 I tried it. Should be double equal sign here.

@eileenmcnaughton
Copy link
Contributor

ok & @agileware-pengyi - once that is changed is it mergeable?

@agileware-pengyi
Copy link
Contributor

@eileenmcnaughton yes. Is there anything I should do with that?

Use double equals instead of single equals
@seamuslee001 seamuslee001 force-pushed the remove_template_field_mosaico branch from 1586a84 to f0327ef Compare August 8, 2019 04:52
@seamuslee001
Copy link
Contributor Author

@eileenmcnaughton @agileware-pengyi both updated now as per Pengyi's comment

@eileenmcnaughton
Copy link
Contributor

OK merging as the required change is made

@eileenmcnaughton eileenmcnaughton merged commit 8f917a6 into civicrm:master Aug 8, 2019
@eileenmcnaughton eileenmcnaughton deleted the remove_template_field_mosaico branch August 8, 2019 08:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants