linagora#630 add autolink filter to description field

asmaNode · Jan 28, 2022 · 6643938 · 6643938
1 parent 9f4a8a2
commit 6643938
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/esn.calendar.libs/app/app.module.js b/src/esn.calendar.libs/app/app.module.js
@@ -34,6 +34,7 @@ angular.module('esn.calendar.libs', [
   'ng.deviceDetector',
   'ngPromiseExtras',
   'ngTouch',
+  'ngSanitize',
   'op.dynamicDirective',
   'pascalprecht.translate',
   'restangular',

diff --git a/src/esn.calendar.libs/app/components/event-preview-popover/event-preview-popover.pug b/src/esn.calendar.libs/app/components/event-preview-popover/event-preview-popover.pug
@@ -50,7 +50,7 @@
     span {{ $ctrl.resources | commaSeparatedResourceList }}
   .info-row(ng-if="$ctrl.event.description")
     i.mdi.mdi-calendar-text
-    span.event-description {{ $ctrl.event.description }}
+    div.event-description(ng-bind-html="$ctrl.event.description | autolink")
   .info-row(ng-if="$ctrl.calendar.id")
     i.mdi.mdi-calendar
     i.mdi.mdi-checkbox-blank-circle.calendar-color-icon(ng-style="{ color: $ctrl.calendar.color }")  

diff --git a/src/esn.calendar.libs/app/components/event/form/event-form.pug b/src/esn.calendar.libs/app/components/event/form/event-form.pug
@@ -81,7 +81,8 @@ form.event-form(role="form", name="form", aria-hidden="true", ng-class="{ 'reado
                   span.input-group-addon.textarea-icon
                     i.mdi.mdi-calendar-text
                   .fg-line
-                    textarea.form-control(cal-auto-size-and-update, type="text", ng-model='editedEvent.description', placeholder="{{ 'Notes...' | translate }}", ng-readonly="!canModifyEvent")
+                   textarea.form-control(ng-show="isOrganizer" cal-auto-size-and-update, type="text", ng-model='editedEvent.description', placeholder="{{ 'Notes...' | translate }}", ng-readonly="!canModifyEvent")
+                   div(ng-show="!isOrganizer" ng-bind-html="editedEvent.description |autolink")
             .col-xs-12
               cal-attendee-tabs(
                 ng-show="selectedTab && attendees.users.length > 0",