avoid duplicate entries

Vladimir Kotal · Vladimir Kotal · commit bf1692190115 · 2019-02-18T12:01:48.000+01:00
approaches #1576
diff --git a/opengrok-web/src/main/webapp/menu.jspf b/opengrok-web/src/main/webapp/menu.jspf
@@ -102,16 +102,18 @@ document.domReady.push(function() { domReadyMenu(); });
                 %><option value="<%= p.getName() %>"<%
                     if (pRequested.contains(p.getName())) {
                         %> selected="selected"<%
+                        pRequested.remove(p.getName());
                     }
                     if (!(messages = MessagesUtils.messagesToJson(p)).isEmpty()) {
-                    %> data-messages='<%= messages %>' <%
-                        }
+                        %> data-messages='<%= messages %>' <%
+                    }
                     %>><%= Util.formQuoteEscape(p.getName()) %></option><%
                 }
                 %></optgroup><%
             }
         }
-  
+
+        // Handle projects not listed in any group.
         if (ph.getGroups().size() > 0 && ph.getAllUngrouped().size() > 0) {
             %><optgroup label="Other"><%
         }
@@ -123,6 +125,7 @@ document.domReady.push(function() { domReadyMenu(); });
         %><option value="<%= p.getName() %>"<%
             if (pRequested.contains(p.getName())) {
                 %> selected="selected"<%
+                pRequested.remove(p.getName());
             }
             if (!(messages = MessagesUtils.messagesToJson(p)).isEmpty()) {
                 %> data-messages='<%= messages %>' <%

Original file line number	Diff line number	Diff line change
`@@ -102,16 +102,18 @@ document.domReady.push(function() { domReadyMenu(); });`
`102`	`102`	`%><option value="<%= p.getName() %>"<%`
`103`	`103`	`if (pRequested.contains(p.getName())) {`
`104`	`104`	`%> selected="selected"<%`
	`105`	`+ pRequested.remove(p.getName());`
`105`	`106`	`}`
`106`	`107`	`if (!(messages = MessagesUtils.messagesToJson(p)).isEmpty()) {`
`107`		`- %> data-messages='<%= messages %>' <%`
`108`		`- }`
	`108`	`+ %> data-messages='<%= messages %>' <%`
	`109`	`+ }`
`109`	`110`	`%>><%= Util.formQuoteEscape(p.getName()) %></option><%`
`110`	`111`	`}`
`111`	`112`	`%></optgroup><%`
`112`	`113`	`}`
`113`	`114`	`}`
`114`		`-`
	`115`	`+`
	`116`	`+ // Handle projects not listed in any group.`
`115`	`117`	`if (ph.getGroups().size() > 0 && ph.getAllUngrouped().size() > 0) {`
`116`	`118`	`%><optgroup label="Other"><%`
`117`	`119`	`}`
`@@ -123,6 +125,7 @@ document.domReady.push(function() { domReadyMenu(); });`
`123`	`125`	`%><option value="<%= p.getName() %>"<%`
`124`	`126`	`if (pRequested.contains(p.getName())) {`
`125`	`127`	`%> selected="selected"<%`
	`128`	`+ pRequested.remove(p.getName());`
`126`	`129`	`}`
`127`	`130`	`if (!(messages = MessagesUtils.messagesToJson(p)).isEmpty()) {`
`128`	`131`	`%> data-messages='<%= messages %>' <%`