Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ca list certs free vlv #4653

Merged
merged 3 commits into from
Jan 15, 2024
Merged

Ca list certs free vlv #4653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cdbf0bc
Using paged search for Search Certificate Web UI
fmarco76 Jan 9, 2024
c22b9bf
Modify ListCert to replace VLV with paged search
fmarco76 Jan 11, 2024
94e0a4b
Update list cert template and tidyup ListCerts
fmarco76 Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions base/ca/shared/webapps/ca/agent/ca/queryBySerial.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,6 @@
form.queryCertFilter.value = "(|(certStatus=VALID)(certStatus=REVOKED))";
}

if (form.serialFrom.value == "") {
form.querySentinelDown.value = "0";
} else {
form.querySentinelDown.value = form.serialFrom.value;
form.querySentinelUp.value = form.serialFrom.value;
form.direction.value = "down";
}
form.op.value = "listCerts";
form.submit();
}
Expand Down Expand Up @@ -177,8 +170,6 @@
<td ALIGN=RIGHT BGCOLOR="#E5E5E5">
<input TYPE="button" VALUE="Find" width="72" onClick="doSubmit(this.form);">&nbsp;&nbsp;
<font size=-1 face="PrimaSans BT, Verdana, sans-serif">first</font>&nbsp;
<INPUT TYPE="hidden" NAME="querySentinelDown" VALUE="">
<INPUT TYPE="hidden" NAME="querySentinelUp" VALUE="">
<INPUT TYPE="hidden" NAME="direction" VALUE="begin">
<INPUT TYPE="TEXT" NAME="maxCount" SIZE=4 MAXLENGTH=99 VALUE="20">
<font size=-1 face="PrimaSans BT, Verdana, sans-serif">records</font>&nbsp;&nbsp;&nbsp;
Expand Down
24 changes: 10 additions & 14 deletions base/ca/shared/webapps/ca/agent/ca/queryCert.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,18 +431,12 @@ function doNext(element)
form.direction.value= "down";

if (element.name == "begin") {
form.querySentinelDown.value = 0;
form.direction.value = "begin";
} else if (element.name == "end") {
form.querySentinelDown.value = result.header.totalRecordCount - result.header.maxCount+1;
form.direction.value = "end";
} else if (element.name == "down") {
form.querySentinelDown.value = result.header.querySentinelDown;
form.querySentinelUp.value = result.header.querySentinelUp;
form.direction.value = "down";
} else if (element.name == "up") {
form.querySentinelUp.value = result.header.querySentinelUp;
form.querySentinelDown.value = result.header.querySentinelDown;
form.direction.value = "up";
}

Expand Down Expand Up @@ -470,9 +464,9 @@ if (result.header.revokeAll != null) {
if (result.header.queryFilterHash != null) {
document.write(renderHidden("queryFilterHash"));
}
var disabledDown = ((result.header.querySentinelDown == null) ||
(result.fixed.maxCount+1 >= result.header.currentRecordCount)) ? "disabled='true'" : "";
var disabledUp = (result.header.querySentinelUp != null && result.header.querySentinelUp <= 1) ? "disabled='true'" : "";
var disabledUp = ((result.header.previousStart == null) ||
(result.header.previousStart <= 0)) ? "disabled='true'" : "";
var disabledDown = (result.header.previousCount + result.header.previousStart >= result.header.totalRecordCount) ? "disabled='true'" : "";

document.write(
"<button NAME=begin onClick='doNext(this)' VALUE='|<<' width='72'>|&lt;&lt;</button>\n"+
Expand All @@ -485,14 +479,16 @@ result.header.queryCertFilter+ "'>\n"+
(result.header.skipRevoked ? result.header.skipRevoked : "") + "'>\n"+
"<INPUT TYPE=hidden NAME=skipNonValid VALUE='"+
(result.header.skipNonValid ? result.header.skipNonValid : "") + "'>\n"+
"<INPUT TYPE=hidden NAME=querySentinelDown VALUE='"+
result.header.querySentinelDown+ "'>\n"+
"<INPUT TYPE=hidden NAME=querySentinelUp VALUE='"+
result.header.querySentinelUp+ "'>\n"+
"<INPUT TYPE=hidden NAME=serialFrom VALUE='"+
(result.header.serialFrom ? result.header.serialFrom : '')+ "'>\n"+
"<INPUT TYPE=hidden NAME=serialTo VALUE='"+
result.header.serialTo+ "'>\n"+
(result.header.serialTo ? result.header.serialTo : '')+ "'>\n"+
"<INPUT TYPE=hidden NAME=direction VALUE='"+
result.header.direction+ "'>\n"+
"<INPUT TYPE=hidden NAME=previousCount VALUE='"+
result.header.previousCount+ "'>\n"+
"<INPUT TYPE=hidden NAME=previousStart VALUE='"+
result.header.previousStart+ "'>\n"+
"<INPUT style='padding-left: 2px;' TYPE=text SIZE=16 NAME=maxCount VALUE='"+
result.header.maxCount+ "'>\n"+

Expand Down
10 changes: 0 additions & 10 deletions base/ca/shared/webapps/ca/ee/ca/queryBySerial.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,6 @@
form.queryCertFilter.value = "(|(certStatus=VALID)(certStatus=REVOKED))";
}

if (form.serialFrom.value == "") {
form.querySentinelDown.value = "0";
} else {
form.querySentinelDown.value = form.serialFrom.value;
form.querySentinelUp.value = form.serialFrom.value;
form.direction.value = "down";
}

form.op.value = "listCerts";
form.submit();
}
Expand Down Expand Up @@ -180,8 +172,6 @@
<td ALIGN=RIGHT BGCOLOR="#E5E5E5">
<input TYPE="button" VALUE="Find" width="72" onClick="doSubmit(this.form);">&nbsp;&nbsp;
<font size=-1 face="PrimaSans BT, Verdana, sans-serif">first</font>&nbsp;
<INPUT TYPE="hidden" NAME="querySentinelDown" VALUE="">
<INPUT TYPE="hidden" NAME="querySentinelUp" VALUE="">
<INPUT TYPE="hidden" NAME="direction" VALUE="begin">
<INPUT TYPE="TEXT" NAME="maxCount" SIZE=10 MAXLENGTH=99 VALUE="20">
<font size=-1 face="PrimaSans BT, Verdana, sans-serif">records</font>&nbsp;&nbsp;&nbsp;
Expand Down
14 changes: 4 additions & 10 deletions base/ca/shared/webapps/ca/ee/ca/queryCert.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,18 +421,12 @@ function doNext(element)
form.direction.value= "down";

if (element.name == "begin") {
form.querySentinelDown.value = 0;
form.direction.value = "begin";
} else if (element.name == "end") {
form.querySentinelDown.value = result.header.totalRecordCount - result.header.maxCount+1;
form.direction.value = "end";
} else if (element.name == "down") {
form.querySentinelDown.value = result.header.querySentinelDown;
form.querySentinelUp.value = result.header.querySentinelUp;
form.direction.value = "down";
} else if (element.name == "up") {
form.querySentinelUp.value = result.header.querySentinelUp;
form.querySentinelDown.value = result.header.querySentinelDown;
form.direction.value = "up";
}

Expand Down Expand Up @@ -464,14 +458,14 @@ function displayNextForm()
nextForm.appendChild(renderHiddenElement("queryFilterHash"));
}

var disabledDown = ((result.header.querySentinelDown == null) ||
(result.fixed.maxCount+1 >= result.header.currentRecordCount));
var disabledUp = (result.header.querySentinelUp != null && result.header.querySentinelUp <= 1);
var disabledUp = ((result.header.previousStart == null) ||
(result.header.previousStart <= 0));
var disabledDown = (result.header.previousCount + result.header.previousStart >= result.header.totalRecordCount);

nextForm.appendChild(renderNextButtonElement("begin", "|<<"));
nextForm.appendChild(renderNextButtonElement("up", "<", disabledUp));

for (let element of ["totalRecordCount", "queryCertFilter", "skipRevoked", "skipNonValid", "querySentinelDown", "querySentinelUp", "serialTo", "direction"]) {
for (let element of ["totalRecordCount", "queryCertFilter", "skipRevoked", "skipNonValid", "previousCount", "previousStart", "direction", "serialFrom", "serialTo"]) {
nextForm.appendChild(renderHiddenElement(element, result.header[element]));
}

Expand Down
Loading
Loading