Skip to content

Commit

Permalink
LIMS-1569: Use a separate flag for getting rings from dials
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Williams committed Dec 10, 2024
1 parent 750e1e9 commit f884c5a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions api/config_sample.php
Original file line number Diff line number Diff line change
Expand Up @@ -393,4 +393,5 @@
# Dials server values
$dials_rest_url = "";
$dials_rest_jwt = "";
$dials_rest_url_rings = false;
?>
4 changes: 2 additions & 2 deletions api/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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
)));
});
Expand Down
4 changes: 2 additions & 2 deletions client/src/js/modules/dc/views/imageviewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit f884c5a

Please sign in to comment.