From ad81c7553d3f3c140ef0f6f83596c216a0f17a36 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Wed, 2 Aug 2017 09:50:24 -0600 Subject: [PATCH] Merge pull request #10 from WAMozart/master * added share-link feature to filemanager context menu --- api/js/etemplate/et2_widget_radiobox.js | 11 ++++++++++- calendar/inc/class.calendar_uiforms.inc.php | 3 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/api/js/etemplate/et2_widget_radiobox.js b/api/js/etemplate/et2_widget_radiobox.js index 5a044f1648..6fc98b137d 100644 --- a/api/js/etemplate/et2_widget_radiobox.js +++ b/api/js/etemplate/et2_widget_radiobox.js @@ -62,11 +62,20 @@ var et2_radiobox = (function(){ "use strict"; return et2_inputWidget.extend( this.createInputWidget(); }, + transformAttributes: function(_attrs) { + this._super.apply(this, arguments); + var readonly = this.getArrayMgr('readonlys').getEntry(this.id); + if(readonly && readonly[_attrs.set_value]) + { + _attrs.readonly = readonly[_attrs.set_value]; + } + }, createInputWidget: function() { this.input = jQuery(document.createElement("input")) .val(this.options.set_value) - .attr("type", "radio"); + .attr("type", "radio") + .attr("disabled", this.options.readonly); this.input.addClass("et2_radiobox"); diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php index d1e5047258..d6a9fe3058 100644 --- a/calendar/inc/class.calendar_uiforms.inc.php +++ b/calendar/inc/class.calendar_uiforms.inc.php @@ -450,7 +450,8 @@ class calendar_uiforms extends calendar_ui // Expand mailing lists if($type == 'l') { - foreach($this->bo->enum_mailing_list($participant) as $contact) + // Ignore ACL here, allow inviting anyone in the list + foreach($this->bo->enum_mailing_list($participant, true) as $contact) { // Mailing lists can contain users, so allow for that possibility $_type = is_numeric($contact) ? '' : $contact[0];