Skip to content

Commit ca8297d

Browse files
authored
Merge pull request #815 from cultuurnet/feature/III-6820
III-6820-Improve place detail: delete button & deleted alert
2 parents 5566d0b + 56efd2c commit ca8297d

File tree

6 files changed

+29
-13
lines changed

6 files changed

+29
-13
lines changed

dist/udb3-angular.js

Lines changed: 12 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/udb3-angular.min.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/core/translations/dutch-translations.constant.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,8 @@ angular.module('udb.core')
398398
'publiq_url': 'Bekijk op {{publicationBrand}}',
399399
'translate': 'Vertalen',
400400
'info_lesson_series': 'Je lessenreeks verschijnt in UiTagenda\'s tot aan het eerste lesmoment.',
401-
'info_holiday_camp': 'Je kamp of vakantie verschijnt in UiTagenda\'s tot aan de startdag.'
401+
'info_holiday_camp': 'Je kamp of vakantie verschijnt in UiTagenda\'s tot aan de startdag.',
402+
'deleted_place': 'Deze locatie is verwijderd.',
402403
},
403404
translate: {
404405
'ready': 'Klaar met vertalen',

src/core/translations/french-translations.constant.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,8 @@ angular.module('udb.core')
395395
'publiq_url': 'Voir sur {{publicationBrand}}',
396396
'translate': 'Traduire',
397397
'info_lesson_series': 'Votre série de cours apparaît dans les agendas UiT jusqu\'au premier moment de la cours.',
398-
'info_holiday_camp': 'Votre camp de vacances apparaîtront dans des calendriers en ligne jusqu\'au jour du début.'
398+
'info_holiday_camp': 'Votre camp de vacances apparaîtront dans des calendriers en ligne jusqu\'au jour du début.',
399+
'deleted_place': 'Ce lieu a été supprimé.',
399400
},
400401
translate: {
401402
'ready': 'Prêt à traduire',

src/core/translations/german-translations.constant.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,8 @@ angular.module('udb.core').constant('udbGermanTranslations', {
393393
'publiq_url': 'Auf {{publicationBrand}}ansehen',
394394
'translate': 'Übersetzen',
395395
'info_lesson_series': 'Ihre Unterrichtsreihe erscheint bis zum ersten Unterrichtszeitpunkt in UiT-Agenden.',
396-
'info_holiday_camp': 'Ihr Camp oder Urlaub wird bis zum Starttag in online Agendas angezeigt.'
396+
'info_holiday_camp': 'Ihr Camp oder Urlaub wird bis zum Starttag in online Agendas angezeigt.',
397+
'deleted_place': 'Dieser Ort wurde gelöscht.',
397398
},
398399
'translate': {
399400
'ready': 'Fertig mit übersetzen',

src/place-detail/ui/place-detail.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ <h1 translate-once="preview.not_found"></h1>
1818
<div ng-if="place && finishedLoading" class="place-detail">
1919
<h1 class="title" ng-bind="::place.name"></h1>
2020

21+
<div ng-if="::place.workflowStatus === 'DELETED'">
22+
<div class="alert alert-danger" style="max-width: fit-content;">
23+
<span translate-once="preview.deleted_place"></span>
24+
</div>
25+
</div>
2126
<div class="alert alert-info p-1"
2227
ng-if="::place.duplicateOf"
2328
style="max-width: 75%; display:inline-flex;">
@@ -48,7 +53,7 @@ <h1 class="title" ng-bind="::place.name"></h1>
4853
<a ng-if="::(permissions.moderate && !isOmdApp)"
4954
class="list-group-item"
5055
ng-href="{{ place.url + '/status' }}"><i class="far fa-calendar-check" aria-hidden="true"></i> <span translate-once="preview.change_availability"></span></a>
51-
<button ng-if="::permissions.delete"
56+
<button ng-if="::permissions.delete && place.workflowStatus !== 'DELETED'"
5257
class="list-group-item"
5358
href="#"
5459
ng-click="deletePlace()"><i class="fa fa-trash" aria-hidden="true"></i> <span translate-once="preview.delete"></span></button>

0 commit comments

Comments
 (0)