(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 4887b80b78184fe45a0d5afbf1b264bab0415edf..d2313760f00e4f7f1f64539257b5f24a74ca6cd4 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -485,7 +485,6 @@ class wsFlash extends cubeFlashGateway {
 \r
                set_time_limit(0);\r
 \r
-               fb(time(), 'get links init');\r
                $dao = new wsDAOBook($core->con);\r
                $book = $dao->selectById($this->args['book_id']);\r
 \r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index c6f2ffac8243cb958375d1e99bffbe2334ff37f0..45ee9bd7f29f4a2b4bc15bc3452dffa2f1c5a18c 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -241,6 +241,10 @@ class wsBookParametres extends wsParametres {
                $this->forms['archives'] = array('label' => __('Archives'),\r
                        'fieldsnames' => array('externalArchives', 'externalArchivesBack', '|', 'archivesLink', 'archivesLabel'));\r
                // .\r
+               $this->fields['form'] = array('type' => 'combo', 'default' => '', 'editable' => true, 'grade' => 5, 'label' => __('Formulaire'), 'datas' => array(__('Aucun') => '', __('Bulle Groupe') => 'bulle'));\r
+               $this->forms['form'] = array('label' => __('Formulaire'),\r
+                       'fieldsnames' => array('form'));\r
+               //.\r
                $this->fields['basket'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Panier activé'), 'grade' => 5);\r
                $this->fields['basketManager'] = array('type' => 'combo', 'default' => 'classic', 'editable' => true, 'label' => __("Manager de panier"),\r
                        'datas' => array(__('Classic') => 'com.fluidbook.player.basket.BasketManager',\r