From f884c5a18a10b04c73d3b6d1e3cc9f31caf956bb Mon Sep 17 00:00:00 2001
From: Mark Williams <mark.williams@diamond.ac.uk>
Date: Tue, 10 Dec 2024 15:43:09 +0000
Subject: [PATCH] LIMS-1569: Use a separate flag for getting rings from dials

---
 api/config_sample.php                         | 1 +
 api/index.php                                 | 4 ++--
 client/src/js/modules/dc/views/imageviewer.js | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/api/config_sample.php b/api/config_sample.php
index a178d48cd..8ea01cf6f 100644
--- a/api/config_sample.php
+++ b/api/config_sample.php
@@ -393,4 +393,5 @@
     # Dials server values
     $dials_rest_url = "";
     $dials_rest_jwt = "";
+    $dials_rest_url_rings = false;
 ?>
diff --git a/api/index.php b/api/index.php
index 6d18071ea..6a500f99e 100644
--- a/api/index.php
+++ b/api/index.php
@@ -72,7 +72,7 @@ function setupApplication($mode): Slim
             $dhl_enable, $scale_grid, $scale_grid_end_date, $preset_proposal, $timezone,
             $valid_components, $enabled_container_types, $ifsummary, $synchweb_version, $redirects,
             $shipping_service_app_url, $use_shipping_service_redirect, $use_shipping_service_redirect_incoming_shipments,
-            $dials_rest_url;
+            $dials_rest_url_rings;
         $app->contentType('application/json');
         $options = $app->container['options'];
         $app->response()->body(json_encode(array(
@@ -96,7 +96,7 @@ function setupApplication($mode): Slim
             'synchweb_version' => $synchweb_version,
             'shipping_service_app_url' => $use_shipping_service_redirect || $use_shipping_service_redirect_incoming_shipments ? $shipping_service_app_url : null,
             'shipping_service_app_url_incoming' => $use_shipping_service_redirect_incoming_shipments ? $shipping_service_app_url : null,
-            'dials_rest_url' => $dials_rest_url,
+            'dials_rest_url_rings' => $dials_rest_url_rings,
             'redirects' => $redirects
         )));
     });
diff --git a/client/src/js/modules/dc/views/imageviewer.js b/client/src/js/modules/dc/views/imageviewer.js
index cefd08ec9..f9f6dd48e 100644
--- a/client/src/js/modules/dc/views/imageviewer.js
+++ b/client/src/js/modules/dc/views/imageviewer.js
@@ -408,7 +408,7 @@ define(['jquery', 'marionette',
             var r = this.detectVerticalSquash(this.img)
             this.ctx.drawImage(this.img, 0, 0, this.width, this.height/r)
 
-            if (!app.options.get("dials_rest_url")) {
+            if (!app.options.get("dials_rest_url_rings")) {
                 if (this.ui.res.is(':checked')) this._draw_res_rings()
                 if (this.ui.ice.is(':checked')) this._draw_ice_rings()
             }
@@ -795,7 +795,7 @@ define(['jquery', 'marionette',
         },
 
         doIceOrRes: function() {
-            if (app.options.get("dials_rest_url")) {
+            if (app.options.get("dials_rest_url_rings")) {
                 this.reloadImage()
             } else {
                 this._dra()