');
+ },
+ success: function success(data) {
+ if (data.success) {
+ (0, _jquery2.default)('#publication-notify-message').empty().append(data.message);
+ } else {
+ (0, _jquery2.default)('#publication-notify-message').empty().append(data.message);
+ (0, _jquery2.default)('#modal_feed #feed_add_notify').prop('checked', false);
+ }
+ }
+ });
+ };
+
var onSubmitPublication = function onSubmitPublication() {
var $dialog = _dialog2.default.get(1);
var error = false;
diff --git a/Phraseanet-production-client/dist/production.min.js b/Phraseanet-production-client/dist/production.min.js
index 5ff1f97aea..e4cf4cc157 100644
--- a/Phraseanet-production-client/dist/production.min.js
+++ b/Phraseanet-production-client/dist/production.min.js
@@ -3298,6 +3298,7 @@ var publication = function publication(services) {
var $feed_title_warning = (0, _jquery2.default)('.feed_title_warning', modal.getDomElement());
var $feed_subtitle_field = (0, _jquery2.default)('#feed_add_subtitle', modal.getDomElement());
var $feed_subtitle_warning = (0, _jquery2.default)('.feed_subtitle_warning', modal.getDomElement());
+ var $feed_add_notify = (0, _jquery2.default)('#feed_add_notify', modal.getDomElement());
feedFieldValidator($feed_title_field, $feed_title_warning, 128);
feedFieldValidator($feed_subtitle_field, $feed_subtitle_warning, 1024);
@@ -3305,6 +3306,11 @@ var publication = function publication(services) {
$feeds_item.removeClass('selected');
(0, _jquery2.default)(this).addClass('selected');
(0, _jquery2.default)('input[name="feed_id"]', $form).val((0, _jquery2.default)('input', this).val());
+ if ((0, _jquery2.default)('#modal_feed #feed_add_notify').is(':checked')) {
+ getUserCount();
+ } else {
+ (0, _jquery2.default)('#publication-notify-message').empty();
+ }
}).hover(function () {
(0, _jquery2.default)(this).addClass('hover');
}, function () {
@@ -3337,9 +3343,41 @@ var publication = function publication(services) {
}
});
+ (0, _jquery2.default)('#modal_feed #feed_add_notify').on('click', function () {
+ var $this = (0, _jquery2.default)(this);
+
+ if ($this.is(':checked')) {
+ getUserCount();
+ } else {
+ (0, _jquery2.default)('#publication-notify-message').empty();
+ }
+ });
+
return;
};
+ var getUserCount = function getUserCount() {
+ _jquery2.default.ajax({
+ type: 'POST',
+ url: '/prod/feeds/notify/count/',
+ dataType: 'json',
+ data: {
+ feed_id: (0, _jquery2.default)('#modal_feed input[name="feed_id"]').val()
+ },
+ beforeSend: function beforeSend() {
+ (0, _jquery2.default)('#publication-notify-message').empty().html('');
+ },
+ success: function success(data) {
+ if (data.success) {
+ (0, _jquery2.default)('#publication-notify-message').empty().append(data.message);
+ } else {
+ (0, _jquery2.default)('#publication-notify-message').empty().append(data.message);
+ (0, _jquery2.default)('#modal_feed #feed_add_notify').prop('checked', false);
+ }
+ }
+ });
+ };
+
var onSubmitPublication = function onSubmitPublication() {
var $dialog = _dialog2.default.get(1);
var error = false;
diff --git a/Phraseanet-production-client/src/components/publication/index.js b/Phraseanet-production-client/src/components/publication/index.js
index cfa78ad65a..748032471b 100644
--- a/Phraseanet-production-client/src/components/publication/index.js
+++ b/Phraseanet-production-client/src/components/publication/index.js
@@ -261,6 +261,7 @@ const publication = (services) => {
let $feed_title_warning = $('.feed_title_warning', modal.getDomElement());
let $feed_subtitle_field = $('#feed_add_subtitle', modal.getDomElement());
let $feed_subtitle_warning = $('.feed_subtitle_warning', modal.getDomElement());
+ let $feed_add_notify = $('#feed_add_notify', modal.getDomElement());
feedFieldValidator($feed_title_field,$feed_title_warning, 128);
feedFieldValidator($feed_subtitle_field,$feed_subtitle_warning, 1024);
@@ -268,6 +269,11 @@ const publication = (services) => {
$feeds_item.removeClass('selected');
$(this).addClass('selected');
$('input[name="feed_id"]', $form).val($('input', this).val());
+ if ($('#modal_feed #feed_add_notify').is(':checked')) {
+ getUserCount();
+ } else {
+ $('#publication-notify-message').empty();
+ }
}).hover(function () {
$(this).addClass('hover');
}, function () {
@@ -302,9 +308,41 @@ const publication = (services) => {
}
});
+ $('#modal_feed #feed_add_notify').on('click', function() {
+ let $this = $(this);
+
+ if ($this.is(':checked')) {
+ getUserCount();
+ } else {
+ $('#publication-notify-message').empty();
+ }
+ });
+
return;
};
+ var getUserCount = function () {
+ $.ajax({
+ type: 'POST',
+ url: '/prod/feeds/notify/count/',
+ dataType: 'json',
+ data: {
+ feed_id: $('#modal_feed input[name="feed_id"]').val(),
+ },
+ beforeSend: function () {
+ $('#publication-notify-message').empty().html('');
+ },
+ success: function (data) {
+ if (data.success) {
+ $('#publication-notify-message').empty().append(data.message);
+ } else {
+ $('#publication-notify-message').empty().append(data.message);
+ $('#modal_feed #feed_add_notify').prop('checked', false);
+ }
+ }
+ });
+ };
+
const onSubmitPublication = () => {
var $dialog = dialog.get(1);
var error = false;
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/FeedController.php b/lib/Alchemy/Phrasea/Controller/Prod/FeedController.php
index 96a32d883c..031be21ebf 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/FeedController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/FeedController.php
@@ -79,6 +79,10 @@ class FeedController extends Controller
->setPublisher($publisher)
->setSubtitle($request->request->get('subtitle', ''));
+ if ($request->request->get('notify')) {
+ $entry->setNotifyEmailOn(new \DateTime());
+ }
+
$feed->addEntry($entry);
$publishing = RecordsRequest::fromRequest($this->app, $request, true, [], [\ACL::BAS_CHUPUB]);
@@ -118,7 +122,37 @@ class FeedController extends Controller
);
}
- public function updateEntryAction(Request $request, $id) {
+ public function notifyCountAction(Request $request)
+ {
+ /** @var Feed|null $feed */
+ $feed = $this->getFeedRepository()->find($request->request->get('feed_id'));
+
+ /** @var \User_Query $Query */
+ $Query = $this->app['phraseanet.user-query'];
+
+ $Query->include_phantoms(true)
+ ->include_invite(false)
+ ->include_templates(false)
+ ->email_not_null(true);
+
+ if ($feed !== null && $feed->getCollection($this->app)) {
+ $Query->on_base_ids([$feed->getCollection($this->app)->get_base_id()]);
+ } elseif ($feed == null) {
+ return $this->app->json([
+ 'success' => false,
+ 'message' => $this->app->trans('publication:: no feed selected')
+ ]);
+ }
+
+ return $this->app->json([
+ 'success' => true,
+ 'message' => $this->app->trans('publication:: %count% users to notify', ['%count%' => $Query->execute()->get_total()])
+ ]);
+ }
+
+ public function updateEntryAction(Request $request, $id)
+ {
+ /** @var FeedEntry $entry */
$entry = $this->getFeedEntryRepository()->find($id);
if (null === $entry) {
@@ -138,6 +172,10 @@ class FeedController extends Controller
->setSubtitle($request->request->get('subtitle', ''))
;
+ if ($request->request->get('notify')) {
+ $entry->setNotifyEmailOn(new \DateTime());
+ }
+
$current_feed_id = $entry->getFeed()->getId();
$new_feed_id = $request->request->get('feed_id', $current_feed_id);
if ($current_feed_id !== (int)$new_feed_id) {
@@ -170,6 +208,10 @@ class FeedController extends Controller
$manager->persist($entry);
$manager->flush();
+ $this->dispatch(PhraseaEvents::FEED_ENTRY_UPDATE, new FeedEntryEvent(
+ $entry, $request->request->get('notify')
+ ));
+
return $this->app->json([
'error' => false,
'message' => 'success',
diff --git a/lib/Alchemy/Phrasea/ControllerProvider/Prod/Feed.php b/lib/Alchemy/Phrasea/ControllerProvider/Prod/Feed.php
index c0cbf70347..0c0d3929f4 100644
--- a/lib/Alchemy/Phrasea/ControllerProvider/Prod/Feed.php
+++ b/lib/Alchemy/Phrasea/ControllerProvider/Prod/Feed.php
@@ -75,6 +75,9 @@ class Feed implements ControllerProviderInterface, ServiceProviderInterface
->bind('prod_feeds_subscribe_feed')
->assert('id', '\d+');
+ $controllers->post('/notify/count/', 'controller.prod.feed:notifyCountAction')
+ ->bind('prod_feeds_notify_count');
+
return $controllers;
}
}
diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/FeedEntrySubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/FeedEntrySubscriber.php
index e67cee0cb0..5c1b8e529d 100644
--- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/FeedEntrySubscriber.php
+++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/FeedEntrySubscriber.php
@@ -13,6 +13,7 @@ namespace Alchemy\Phrasea\Core\Event\Subscriber;
use Alchemy\Phrasea\Core\Event\FeedEntryEvent;
use Alchemy\Phrasea\Core\PhraseaEvents;
+use Alchemy\Phrasea\Model\Entities\FeedEntry;
use Alchemy\Phrasea\Model\Entities\User;
use Alchemy\Phrasea\Model\Entities\WebhookEvent;
use Alchemy\Phrasea\Model\Manipulator\TokenManipulator;
@@ -23,20 +24,51 @@ class FeedEntrySubscriber extends AbstractNotificationSubscriber
{
public function onCreate(FeedEntryEvent $event)
{
- $entry = $event->getFeedEntry();
-
$params = [
- 'entry_id' => $entry->getId(),
+ 'entry_id' => $event->getFeedEntry()->getId(),
'notify_email' => $event->hasEmailNotification(),
];
$this->app['manipulator.webhook-event']->create(
WebhookEvent::NEW_FEED_ENTRY,
WebhookEvent::FEED_ENTRY_TYPE,
- array_merge(array('feed_id' => $entry->getFeed()->getId()), $params),
+ array_merge(array('feed_id' => $event->getFeedEntry()->getFeed()->getId()), $params),
[]
);
+ $this->sendEmailNotification($event);
+ }
+
+ public function onUpdate(FeedEntryEvent $event)
+ {
+ $this->sendEmailNotification($event);
+ }
+
+ public static function getSubscribedEvents()
+ {
+ return [
+ PhraseaEvents::FEED_ENTRY_CREATE => 'onCreate',
+ PhraseaEvents::FEED_ENTRY_UPDATE => 'onUpdate'
+ ];
+ }
+
+ /**
+ * @return TokenManipulator
+ */
+ private function getTokenManipulator()
+ {
+ return $this->app['manipulator.token'];
+ }
+
+ private function sendEmailNotification(FeedEntryEvent $event)
+ {
+ $entry = $event->getFeedEntry();
+
+ $params = [
+ 'entry_id' => $entry->getId(),
+ 'notify_email' => $event->hasEmailNotification(),
+ ];
+
$datas = json_encode($params);
$Query = $this->app['phraseanet.user-query'];
@@ -98,19 +130,4 @@ class FeedEntrySubscriber extends AbstractNotificationSubscriber
}
while (count($results) > 0);
}
-
- public static function getSubscribedEvents()
- {
- return [
- PhraseaEvents::FEED_ENTRY_CREATE => 'onCreate',
- ];
- }
-
- /**
- * @return TokenManipulator
- */
- private function getTokenManipulator()
- {
- return $this->app['manipulator.token'];
- }
}
diff --git a/lib/Alchemy/Phrasea/Core/PhraseaEvents.php b/lib/Alchemy/Phrasea/Core/PhraseaEvents.php
index 1e1daf714b..fe7687cbb6 100644
--- a/lib/Alchemy/Phrasea/Core/PhraseaEvents.php
+++ b/lib/Alchemy/Phrasea/Core/PhraseaEvents.php
@@ -31,6 +31,7 @@ final class PhraseaEvents
const ORDER_DENY = 'order.deny';
const FEED_ENTRY_CREATE = 'feed-entry.create';
+ const FEED_ENTRY_UPDATE = 'feed-entry.update';
const REGISTRATION_CREATE = 'registration.create';
const REGISTRATION_AUTOREGISTER = 'registration.autoregister';
diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf
index 8889fc0895..354324f6c4 100644
--- a/resources/locales/messages.de.xlf
+++ b/resources/locales/messages.de.xlf
@@ -1,14 +1,14 @@
-
+