hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-19 16:03:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #690 from romainneutron/fix-1488

Browse Source 
[3.8] Fix #1488 : Push / Feedback name is now mandatory
This commit is contained in:
Romain Neutron
2013-10-10 07:15:21 -07:00
parent d296237154 f648ea296f
commit e92a8459b2
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Alchemy/Phrasea/Controller/Prod/Language.php
View File

@@ -85,6 +85,7 @@ class Language implements ControllerProviderInterface
$out['FeedBackName'] = _('Name'); $out['FeedBackName'] = _('Name');
$out['FeedBackMessage'] = _('Message'); $out['FeedBackMessage'] = _('Message');
$out['FeedBackDuration'] = _('Time for feedback (days)'); $out['FeedBackDuration'] = _('Time for feedback (days)');
$out['FeedBackNameMandatory'] = _('Please provide a name for this selection.');
$out['send'] = _('Send'); $out['send'] = _('Send');
$out['Recept'] = _('Accuse de reception'); $out['Recept'] = _('Accuse de reception');
$out['nFieldsChanged'] = _('%d fields have been updated'); $out['nFieldsChanged'] = _('%d fields have been updated');

14
lib/Alchemy/Phrasea/Controller/Prod/Push.php
View File

@@ -157,12 +157,7 @@ class Push implements ControllerProviderInterface
try { try {
$pusher = new RecordHelper\Push($app, $app['request']); $pusher = new RecordHelper\Push($app, $app['request']);
$push_name = $request->request->get('name'); $push_name = $request->request->get('name', sprintf(_('Push from %s'), $app['authentication']->getUser()->get_display_name()));
if (trim($push_name) === '') {
$push_name = sprintf(_('Push from %s'), $app['authentication']->getUser()->get_display_name());
}
$push_description = $request->request->get('push_description'); $push_description = $request->request->get('push_description');
$receivers = $request->request->get('participants'); $receivers = $request->request->get('participants');
@@ -281,12 +276,7 @@ class Push implements ControllerProviderInterface
$repository = $app['EM']->getRepository('\Entities\Basket'); $repository = $app['EM']->getRepository('\Entities\Basket');
$validation_name = $request->request->get('name'); $validation_name = $request->request->get('name', sprintf(_('Validation from %s'), $app['authentication']->getUser()->get_display_name()));
if (trim($validation_name) === '') {
$validation_name = sprintf(_('Validation from %s'), $app['authentication']->getUser()->get_display_name());
}
$validation_description = $request->request->get('validation_description'); $validation_description = $request->request->get('validation_description');
$participants = $request->request->get('participants'); $participants = $request->request->get('participants');

12
www/skins/prod/jquery.Feedback.js
View File

@@ -155,6 +155,18 @@
var buttons = {}; var buttons = {};
buttons[language.send] = function(){ buttons[language.send] = function(){
if ($.trim($('input[name="name"]', $dialog.getDomElement()).val()) === '') {
options = {
size : 'Alert',
closeButton : true,
title : language.warning
},
$dialog = p4.Dialog.Create(options, 3);
$dialog.setContent(language.FeedBackNameMandatory);
return false;
}
$dialog.Close(); $dialog.Close();
$('input[name="name"]', $FeedBackForm).val($('input[name="name"]', $dialog.getDomElement()).val()); $('input[name="name"]', $FeedBackForm).val($('input[name="name"]', $dialog.getDomElement()).val());