holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10 from WAMozart/master

Browse Source 
* added share-link feature to filemanager context menu
This commit is contained in:
Nathan Gray 2017-08-02 09:50:24 -06:00 committed by nathangray
parent 3870d9803e
commit ad81c7553d
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/js/etemplate/et2_widget_radiobox.js
View File

@ -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");

3
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -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];