Merge 2024.2 Gold D patches (2/2)

svn path=/Website/trunk/; revision=66393

APPL/Shared/resultset_table_v2.inc

@@ -1379,6 +1379,8 @@ function __rsProcessResultset(processParams) // processParams wordt blind aan al
           badgehtml = "<span class='subtab-badge-icon subtab-badge-missing'>"
                     +     I("fa-exclamation-triangle fa-lg", { "fastyle": "fas" })
                     + "</span>"
+        }
+        if (!this.subtabicon) {
 %>    <script>
           var prevent_badge_reset = false;
 <%        if (!badgehtml && this.rstableNr && this.rstableNr > 1)

UTILS/refresh/autorefreshaccept.bat

@@ -47,11 +47,11 @@ IF NOT EXIST %script% GOTO noupgrade
 ECHO About to perform upgrade %script%>>%logfile%
 EXIT | sqlplus.exe %targetUSER%/%targetPASS%@%targetSERVER% @%script% >>%logfile% 2>>&1
 
+:noupgrade
+
 ECHO Running anon_%fac_refresh_anon%.sql >>%logfile%
 EXIT | sqlplus.exe %targetUSER%/%targetPASS%@%targetSERVER% @anon_%fac_refresh_anon%.sql >>%logfile% 2>>&1
 
-:noupgrade
-
 IF x%deletedmp%==x1 DEL %dmpfile%
 
 GOTO end