From c3b23a32268c0eceb86758e3f8d745026aca4df6 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Wed, 11 Apr 2018 15:21:11 +0100
Subject: [PATCH] FIX #300 missing keyword in redirect groupbasket
---
.../app/administration/basket-administration.component.ts | 7 +++++++
package-lock.json | 6 +++---
package.json | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/apps/maarch_entreprise/js/angular/app/administration/basket-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/basket-administration.component.ts
index c480c2d16d2..f5fba899d39 100644
--- a/apps/maarch_entreprise/js/angular/app/administration/basket-administration.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/basket-administration.component.ts
@@ -323,6 +323,13 @@ export class BasketAdministrationSettingsModalComponent extends AutoCompletePlug
icon: 'fa fa-hashtag',
allowed: true,
text: "Même niveau de mon entité primaire"
+ }, {
+ id: 'ENTITIES_JUST_UP',
+ keyword: 'ENTITIES_JUST_UP',
+ parent: '#',
+ icon: 'fa fa-hashtag',
+ allowed: true,
+ text: "Immédiatement supérieur à mon entité primaire"
}];
keywordEntities.forEach((keyword: any) => {
diff --git a/package-lock.json b/package-lock.json
index ed3a8b150b9..2eb5d74ee92 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8616,9 +8616,9 @@
}
},
"tinymce": {
- "version": "4.7.10",
- "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.7.10.tgz",
- "integrity": "sha512-8rJJoQDSMZ/myDRiQkbJA0X9b/XpNdv99tDS2B/mTcOY6iMgOTLnVNZI+h23ylIECp5HIX0Xt8cFg+OvJ92NRw=="
+ "version": "4.7.11",
+ "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.7.11.tgz",
+ "integrity": "sha512-rLWAibMZa1oFaxucufQxVacbXzt5LJe0lSgsRYlLIi0YOhl6JKFIuYqxlU74UygaAliDlNUX84hlMj7Ky0QmXQ=="
},
"to-arraybuffer": {
"version": "1.0.1",
diff --git a/package.json b/package.json
index b6180db676d..4f547c4e934 100755
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
"jquery.nicescroll": "~3.6.8",
"jstree-bootstrap-theme": "^1.0.1",
"photoswipe": "^4.1.2",
- "tinymce": "^4.7.10",
+ "tinymce": "^4.7.11",
"tooltipster": "^4.2.6",
"zone.js": "^0.8.26"
},
--
GitLab