From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 24 Jan 2020 17:44:54 +0000 (+0000)
Subject: fix #3366 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=5858b8196ed832e252d33baca30a8cc38cbd418c;p=cubeextranet.git

fix #3366 @0.5
---

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index a361fc867..4098a32df 100644
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -1337,8 +1337,6 @@ class wsAjax extends cubeAjax
 
         $nlines = count($sheet);
 
-        $x->addDebug($nlines);
-
         for ($i = 1; $i < $nlines; $i++) {
             $line = $sheet[$i];
             $id = (int)$line[0];
@@ -1353,8 +1351,6 @@ class wsAjax extends cubeAjax
                 }
                 $settings[$col] = $v;
             }
-            //  $x->addDebug($id.' : '.json_encode($settings));
-
             try {
                 $dao->setSettings($id, $settings);
             } catch (Exception $e) {
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index d60aded3b..0b3416f0e 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -2209,12 +2209,12 @@ html.tall{height:150%}' . "\n";
 
     public static function getAdditionalSettingsMap(): array
     {
-        return ['book_id' => 'book_id', 'lang' => 'lang', 'theme' => 'theme', 'status' => 'status', 'proprietaire_id' => 'owner', 'date' => 'date', 'changedate' => 'changedate', 'hosting' => 'hosting', 'exportdatas' => 'exportdata'];
+        return ['book_id' => 'book_id', 'lang' => 'lang', 'theme' => 'theme', 'status' => 'status', 'proprietaire_id' => 'owner', 'date' => 'date', 'changedate' => 'changedate', 'wslink' => 'wslink', 'hosting' => 'hosting', 'exportdatas' => 'exportdata'];
     }
 
     public static function getReadonlySettings()
     {
-        return ['book_id', 'date', 'changedate', 'hosting', 'exportdatas'];
+        return ['book_id', 'date', 'changedate', 'wslink', 'hosting', 'exportdatas'];
     }
 
     public static function exportPublicationSettings($args)
@@ -2279,6 +2279,8 @@ html.tall{height:150%}' . "\n";
                     } else {
                         $val = '-';
                     }
+                } else if ($column === 'wslink') {
+                    $val = 'https://workshop.fluidbook.com/viewerh/' . $id . '_' . $book->hash . '/';
                 } else {
                     $val = $book->$column;
                 }