fix #3366 @0.5

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index a361fc867344826bfc155d2a1744a44ed867adf4..4098a32df4ba56a94d7214fe01dbdd9415cc49a8 100644 (file)
--- 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 d60aded3baa3e52a8a6f2b317853fe82f06501ba..0b3416f0e43f5edab2ca5361d756926f8ccddc74 100644 (file)
--- 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;
                 }