Eileen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401426 )
Change subject: Fix for secondary emails on unsubscribe email page ...................................................................... Fix for secondary emails on unsubscribe email page An issue was logged on our extension on github pointing out that the unsubscribe email screen (civicrm/a/#/email/unsubscribe) is not displaying non-primary emails to remove the bulk mail tag for if there are no primaries with that email. In practice I suspect this has no real effect on us as I suspect we don't deal much in that flag but we should port up. https://github.com/eileenmcnaughton/org.wikimedia.unsubscribeemail/issues/2 Bug: T183884 Change-Id: I91edf3c94414d9531961250d0649f2957824e611 --- M sites/default/civicrm/extensions/org.wikimedia.unsubscribeemail/ang/unsubscribeemail/UnsubCntrl.html M sites/default/civicrm/extensions/org.wikimedia.unsubscribeemail/info.xml 2 files changed, 28 insertions(+), 29 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/26/401426/1 diff --git a/sites/default/civicrm/extensions/org.wikimedia.unsubscribeemail/ang/unsubscribeemail/UnsubCntrl.html b/sites/default/civicrm/extensions/org.wikimedia.unsubscribeemail/ang/unsubscribeemail/UnsubCntrl.html index 76b38b4..910d5e6 100755 --- a/sites/default/civicrm/extensions/org.wikimedia.unsubscribeemail/ang/unsubscribeemail/UnsubCntrl.html +++ b/sites/default/civicrm/extensions/org.wikimedia.unsubscribeemail/ang/unsubscribeemail/UnsubCntrl.html @@ -57,32 +57,31 @@ </table> </div> </div> - <div ng-show="unsubscribeEmails[0]"><h3>{{ts('Emails to remove bulk email flag from (non primary)')}}</h3> - <p>{{ ts('These contacts have %1 as as a non-primary email. Leave them checked and click - unsubscribe to unset the bulk email flag on them.', {1: formVars.enteredEmail}) }}</p> - <div class="crm-group"> - <table> - <tr> - <th width="50%">{{ ts('Contact') }}</th> - <th>{{ ts('Unset bulk email flag on email address?') }}</th> - </tr> - <tr ng-repeat="unsubscribeEmail in unsubscribeEmails"> - <td> - <a href="{{unsubscribeEmail.url}}">{{unsubscribeEmail.contact_id_display_name}}</a> - </td> - <td> - <span ng-show="unsubscribeEmail.is_bulkmail == 0 && !unsubscribeEmail.opt_out_actioned">{{ ts('Email is not set as bulk email') }}</span> - <span ng-show="unsubscribeEmail.is_bulkmail == 0 && unsubscribeEmail.opt_out_actioned">{{ ts('Bulk email flag has been removed from this email') }}</span> - <span ng-show="unsubscribeEmail.is_bulkmail == 1"> - <input type="checkbox" ng-model="unsubscribeEmail.do_opt_out"/> - </span> - </td> - </tr> - </table> - </div> + </div> + <div ng-show="unsubscribeEmails[0]"><h3>{{ts('Emails to remove bulk email flag from (non primary)')}}</h3> + <p>{{ ts('These contacts have %1 as as a non-primary email. Leave them checked and click + unsubscribe to unset the bulk email flag on them.', {1: formVars.enteredEmail}) }}</p> + <div class="crm-group"> + <table> + <tr> + <th width="50%">{{ ts('Contact') }}</th> + <th>{{ ts('Unset bulk email flag on email address?') }}</th> + </tr> + <tr ng-repeat="unsubscribeEmail in unsubscribeEmails"> + <td> + <a href="{{unsubscribeEmail.url}}">{{unsubscribeEmail.contact_id_display_name}}</a> + </td> + <td> + <span ng-show="unsubscribeEmail.is_bulkmail == 0 && !unsubscribeEmail.opt_out_actioned">{{ ts('Email is not set as bulk email') }}</span> + <span ng-show="unsubscribeEmail.is_bulkmail == 0 && unsubscribeEmail.opt_out_actioned">{{ ts('Bulk email flag has been removed from this email') }}</span> + <span ng-show="unsubscribeEmail.is_bulkmail == 1"> + <input type="checkbox" ng-model="unsubscribeEmail.do_opt_out"/> + </span> + </td> + </tr> + </table> </div> </div> - </div> <div ng-show="!unsubscribeContacts[0] && !unsubscribeEmails[0] && searchedEmail && searchedEmail == formVars.enteredEmail"> {{ts ('The email %1 is not used as a the primary email for any contact in your database and it is not subscribed to any bulk emails', {1: diff --git a/sites/default/civicrm/extensions/org.wikimedia.unsubscribeemail/info.xml b/sites/default/civicrm/extensions/org.wikimedia.unsubscribeemail/info.xml index 112e5ed..e340578 100755 --- a/sites/default/civicrm/extensions/org.wikimedia.unsubscribeemail/info.xml +++ b/sites/default/civicrm/extensions/org.wikimedia.unsubscribeemail/info.xml @@ -9,13 +9,13 @@ <email>[email protected]</email> </maintainer> <urls> - <url desc="Main Extension Page">http://FIXME</url> - <url desc="Documentation">http://FIXME</url> - <url desc="Support">http://FIXME</url> + <url desc="Main Extension Page">https://github.com/eileenmcnaughton/org.wikimedia.unsubscribeemail</url> + <url desc="Documentation">https://github.com/eileenmcnaughton/org.wikimedia.unsubscribeemail</url> + <url desc="Support">https://github.com/eileenmcnaughton/org.wikimedia.unsubscribeemail</url> <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> - <releaseDate>2016-11-22</releaseDate> - <version>1.0</version> + <releaseDate>2018-01-02</releaseDate> + <version>1.1</version> <develStage>stable</develStage> <compatibility> <ver>4.7</ver> -- To view, visit https://gerrit.wikimedia.org/r/401426 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I91edf3c94414d9531961250d0649f2957824e611 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Eileen <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
