Merge master

This commit is contained in:
Thibaud Fabre
2016-12-05 17:48:19 +01:00
5 changed files with 239 additions and 0 deletions

View File

@@ -45,6 +45,26 @@ class MoveCollectionController extends Controller
$template = $this->render('prod/actions/collection_default.html.twig', $parameters);
}
<<<<<<< HEAD
=======
if (count($records->databoxes()) > 1) {
$success = false;
$message = $this->app->trans('prod::Les enregistrements ne provienent pas tous de la meme base et ne peuvent donc etre traites ensemble');
} elseif (count($records) == 0) {
$success = false;
$message = $this->app->trans('prod::Vous n\'avez le droit d\'effectuer l\'operation sur aucun document');
} else {
// is able to move:
$success = true;
$parameters = [
'records' => $records,
'message' => '',
'collections' => $collections,
];
$template = $this->render('prod/actions/collection_default.html.twig', $parameters);
}
>>>>>>> origin/master
$datas = [
'success' => $success,
'message' => $message,