From 81c7087dc596eb6ed3f734668e129a7f9038f0d8 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 18 Jun 2018 16:22:37 +0000 Subject: [PATCH] done #2034 @1.5 --- composer.json | 1 + inc/ws/Controlleur/class.ws.url.php | 248 ++-- inc/ws/Metier/class.ws.book.parametres.php | 16 + style/ws/style.css | 1239 +++++++++++++------- 4 files changed, 976 insertions(+), 528 deletions(-) diff --git a/composer.json b/composer.json index 024757558..6abd43841 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,6 @@ { "require": { + "php": ">=7.2", "php-mime-mail-parser/php-mime-mail-parser": "2.11.1" } } diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index 8dbef6cec..121a7b341 100644 --- a/inc/ws/Controlleur/class.ws.url.php +++ b/inc/ws/Controlleur/class.ws.url.php @@ -1,8 +1,10 @@ admin) { $res .= '' . $btDownload . ''; } else { - $res .= '' . $btDownload . ''; + $res .= self::contextBookDownload($context_download_id, $droits, $book); + $res .= '' . $btDownload . ''; } } else { $res .= ''; @@ -166,7 +170,8 @@ class wsUrl { return $res; } - public static function collections() { + public static function collections() + { global $core; if (isset($args[1])) { @@ -192,7 +197,8 @@ class wsUrl { return $res; } - public static function collection($args) { + public static function collection($args) + { global $core; commonDroits::min(1); cubePage::ui('Sortable'); @@ -214,7 +220,8 @@ class wsUrl { return $res; } - public static function collectionEdit($collection) { + public static function collectionEdit($collection) + { global $core; $res = '

Gestion de la collection « ' . $collection->nom . ' » # ' . $collection->collection_id . '

'; @@ -390,14 +397,16 @@ class wsUrl { return $res; } - public static function viewCollectionFile($file, $collection_id) { + public static function viewCollectionFile($file, $collection_id) + { $res = ''; $res .= cubeMedia::tango('actions/document-save.png'); $res .= ''; return $res; } - public static function getSelectVersions($versions) { + public static function getSelectVersions($versions) + { fb($versions); $res = array('-----' => ''); $e = explode(',', $versions); @@ -409,7 +418,8 @@ class wsUrl { return $res; } - public static function listeCollections($dashboard = null, $settings = null) { + public static function listeCollections($dashboard = null, $settings = null) + { global $core; cubePage::truePopup(); @@ -478,7 +488,8 @@ class wsUrl { return $res; } - public static function getFluidbookVersions($select = false) { + public static function getFluidbookVersions($select = false) + { $droits = wsDroits::getDroits(); $chooseVersion = wsDroits::admin(); @@ -531,16 +542,33 @@ class wsUrl { return $res; } - public static function contextBookDownload($id, $droits) { + public static function contextBookDownload($id, $droits, $book = null) + { global $core; $versions = self::getFluidbookVersions(); + if (null !== $book) { + $id .= '_' . $book->book_id; + } + $res = '
'; $res .= '