Skip to content

Commit 71dc620

Browse files
committed
Merge branch 'pu/ss/fixressourceonlyinvite' into '2024.11'
Pu/ss/fixressourceonlyinvite See merge request tine20/tine20!5377
2 parents fb1a193 + d47edea commit 71dc620

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

tine20/Calendar/Model/Attender.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ public function getResolvedUser($event = null, $resolveDisplayContainer = true)
459459
} elseif ($this->user_type === self::USERTYPE_RESOURCE) {
460460
$resource = $this->user_id;
461461
if (! $resource instanceof Calendar_Model_Resource) {
462-
$resource = Calendar_Controller_Resource::getInstance()->get($resource);
462+
$resource = Calendar_Controller_Resource::getInstance()->get($resource, _aclProtect: false);
463463
}
464464
// return pseudo contact with resource data
465465
$result = new Addressbook_Model_Contact(array(

tine20/Tinebase/js/ux/PopupWindowManager.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ Ext.ux.PopupWindowGroup = function(config) {
126126
}
127127
list[win.name] = win;
128128
accessList.push(win);
129+
console.error(win);
129130
//win.on('hide', activateLast);
130131
},
131132

@@ -142,6 +143,7 @@ Ext.ux.PopupWindowGroup = function(config) {
142143
* @return {Ext.ux.PopupWindow}
143144
*/
144145
get : function(name){
146+
console.error(name);
145147
cleanupClosedWindows();
146148
name = typeof name == "object" ? name.name : name;
147149
return list[name];

tine20/Tinebase/js/ux/WindowFactory.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ Ext.ux.WindowFactory.prototype = {
144144
* constructs window items from config properties
145145
*/
146146
getCenterPanel: async function (config, win) {
147+
debugger;
147148
config.contentPanelConstructorConfig = config.contentPanelConstructorConfig || {};
148149

149150
config.contentPanelConstructorConfig.setWaitText = async (text) => {

0 commit comments

Comments
 (0)