From d664d6668d03749d4020fef1a415d834d0bc101b Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Thu, 14 Nov 2024 10:26:13 +0100 Subject: [PATCH 1/2] XWIKI-21629: The step order displayed in inline edit is not consistent with the order from objects editor * Removed the operation on the order number that caused confusion --- .../src/main/resources/TourCode/StepsListing.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/StepsListing.xml b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/StepsListing.xml index f982c3bc83c2..9294bda5cc02 100644 --- a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/StepsListing.xml +++ b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/StepsListing.xml @@ -85,7 +85,7 @@ #set($reflex = $step.getValue('reflex')) #set($stepID = $step.getNumber()) <tr> - <td>$!mathtool.add($order, 1)</td> + <td>$!order</td> <td>$!element</td> <td>$services.localization.render($!title)</td> <td> From ac9e1472ab1a6e264b5787724c022fbd95d24835 Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Thu, 14 Nov 2024 10:37:56 +0100 Subject: [PATCH 2/2] XWIKI-21629: The step order displayed in inline edit is not consistent with the order from objects editor * Removed similar operations, I searched in the module all uses of `mathtool`. --- .../src/main/resources/TourCode/StepSheet.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/StepSheet.xml b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/StepSheet.xml index 49848f0e406c..f1c4ff217da2 100644 --- a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/StepSheet.xml +++ b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/src/main/resources/TourCode/StepSheet.xml @@ -78,11 +78,11 @@ <select id="stepOrderSelect"> #if ($nbSteps > 0) #foreach($i in [0..$mathtool.sub($nbSteps, 1)]) - <option value="$i" #if ($vobj.getProperty('order').value == $i) selected #end >$mathtool.add($i, 1)</option> + <option value="$i" #if ($vobj.getProperty('order').value == $i) selected #end >$i</option> #end #end #if ($isNewStep) - <option value="$nbSteps" selected >$mathtool.add($nbSteps, 1)</option> + <option value="$nbSteps" selected >$nbSteps</option> #end </select> </dd>