[TikiWiki-commits] [Git][tikiwiki/tiki][29.x] [BP][FIX] Calendar: Prevent user without the view_events permission to see the popup description
"luci \(@luciash\) via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <6986408236a7c_3b1849e44916@gitlab-sidekiq-low-urgency-cpu-bound-v2-68489d46b7-jtcn7.mail> |
luci pushed to branch 29.x at Tiki Wiki CMS Groupware / Tiki
Commits:
af8bbbd0 by Adrien Mbuya Maloba at 2026-02-06T19:18:38+00:00
[BP][FIX] Calendar: Prevent user without the view_events permission to see the popup description
---
* [FIX] Calendar: Prevent user without the view_events permission to see the popup description
---
* [FIX] Calendar: Prevent user without the view_events permission to see the popup description
See merge request tikiwiki/tiki!9482
See merge request tikiwiki/tiki!9499
- - - - -
2 changed files:
- lib/core/Services/Calendar/Controller.php
- src/js/jquery-tiki/tiki-calendar.js
Changes:
=====================================
lib/core/Services/Calendar/Controller.php
=====================================
@@ -155,14 +155,6 @@ class Services_Calendar_Controller extends Services_Calendar_BaseController
}
}
- $listevents = Perms::filter(
- ['type' => 'calendaritem'],
- 'object',
- $listevents,
- ['object' => 'calitemId'],
- ['view_events']
- );
-
$parserLib = TikiLib::lib('parser');
$events = [];
=====================================
src/js/jquery-tiki/tiki-calendar.js
=====================================
@@ -192,7 +192,8 @@ $.fn.setupEventCalendar = function (
}
}
const eventTitle = tooltipEscape(event.title);
- element.attr("title", eventTitle + "|" + event.extendedProps.description);
+ const eventDescription = event.extendedProps.viewable === true ? event.extendedProps.description : "";
+ element.attr("title", eventTitle + "|" + eventDescription);
element.addClass("tips");
// surely there's a better way?
$(element).parent().tiki_popover();
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/af8bbbd02d213a80e528d09bef11faa09e503fa8
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/af8bbbd02d213a80e528d09bef11faa09e503fa8
You're receiving this email because of your account on gitlab.com.
_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs