Skip to content
Permalink
Browse files
JUDDI-1009 reworks a number of functions in the ui related to paging …
…operations, limits, offsets, etc. i think everything is working now. Adds some new functionality and some alt text warnings when using uddiv2 connections (offsets are not in the data model)
  • Loading branch information
spyhunter99 committed Jul 19, 2020
1 parent 033870a commit ab728473c9197a48c15934bedafde537d502512d
Showing 33 changed files with 250 additions and 206 deletions.
@@ -1037,11 +1037,13 @@ public String SaveServiceDetails(BusinessService be) {
throw ex;
}
}
return ResourceLoader.GetResource(session, "actions.saved") + " "
+ "<a href=\"serviceEditor.jsp?id=" + URLEncoder.encode(saveService.getBusinessService().get(0).getServiceKey(), "UTF8")
+ "\">" + StringEscapeUtils.escapeHtml(saveService.getBusinessService().get(0).getServiceKey()) + "</a>";
return ResourceLoader.GetResource(session, "actions.saved") + " "
+ " <script type=\"text/javascript\">window.location.href='"
+ StringEscapeUtils.escapeJavaScript("serviceEditor.jsp?id=" + URLEncoder.encode(saveService.getBusinessService().get(0).getServiceKey(), "UTF8")) + "';</script>"
+ "<a href=\"serviceEditor.jsp?id=" + URLEncoder.encode(saveService.getBusinessService().get(0).getServiceKey(), "UTF8")
+ "\">" + StringEscapeUtils.escapeHtml(saveService.getBusinessService().get(0).getServiceKey()) + "</a>";
} catch (Exception ex) {
return HandleException(ex);
return HandleException(ex);
}
}

@@ -2241,7 +2243,9 @@ public String SaveTModel(TModel be) {
}
}
//return ResourceLoader.GetResource(session, "actions.saved");
return ResourceLoader.GetResource(session, "actions.saved") + " "
return ResourceLoader.GetResource(session, "actions.saved") +
" <script type=\"text/javascript\">window.location.href='"+
StringEscapeUtils.escapeJavaScript("tmodelEditor.jsp?id=" + URLEncoder.encode(saveTModel.getTModel().get(0).getTModelKey(), "UTF8")) + "';</script>"
+ "<a href=\"tmodelEditor.jsp?id=" + URLEncoder.encode(saveTModel.getTModel().get(0).getTModelKey(), "UTF8")
+ "\">" + StringEscapeUtils.escapeHtml(saveTModel.getTModel().get(0).getTModelKey()) + "</a>";
} catch (Exception ex) {
@@ -451,3 +451,5 @@ items.categorizations=Categorizations
items.categorizations.uddi=UDDI Categorizations
actions.return=Return
items.settings.edit=Edit
totals.offset.v2disclaimer=Offset does not work with UDDIv2 based endpoints.
totals.fetch=Fetch
@@ -453,3 +453,5 @@ items.categorizations=Categorizaciones
items.categorizations.uddi=UDDI Categorizaciones
actions.return=Volver
items.settings.edit=Editar
totals.offset.v2disclaimer=La compensaci\u00f3n no funciona con puntos finales basados \u200b\u200ben UDDIv2.
totals.fetch=Recuperar Tama\u00f1o
@@ -30,12 +30,12 @@
<%@include file="header-top.jsp" %>
<div class="container">

<!-- Main hero unit for a primary marketing message or call to action -->

<div class="well">
<h1><%=ResourceLoader.GetResource(session, "navbar.help.about")%></h1>
</div>

<!-- Example row of columns -->

<div class="row">
<div class="span12">
<%=ResourceLoader.GetResource(session, "pages.about.content")%>
@@ -35,12 +35,12 @@
<%@include file="header-top.jsp" %>
<div class="container">

<!-- Main hero unit for a primary marketing message or call to action -->

<div class="well">
<h1><%=ResourceLoader.GetResource(session, "navbar.advanced")%></h1>
</div>

<!-- Example row of columns -->

<div class="row">
<div class="span12">
<%= ResourceLoader.GetResource(session, "pages.advanced.content")%>
@@ -29,7 +29,7 @@
UddiHub x = UddiHub.getInstance(application, request.getSession());
int offset = 0;
int maxrecords = 20;
int maxrecords = 1000;
String lang = request.getParameter("lang");
if (lang == null || lang.length() == 0) {
lang = null;
@@ -54,8 +54,8 @@
}
try {
maxrecords = Integer.parseInt(request.getParameter("maxrecords"));
if (maxrecords <= 0 || maxrecords > 50) {
maxrecords = 50;
if (maxrecords <= 0 || maxrecords > 1000) {
maxrecords = 1000;
}
} catch (Exception ex) {
}
@@ -74,7 +74,7 @@
<script type="text/javascript">
totalrecordsBusiness=<%=ret.totalrecords%>;
$("#totalrecordsBusiness").text(totalrecordsBusiness);
$("#offsetBusiness").text(<%=offset%>);
$("#offsetBusiness").val(<%=offset%>);
$("#displayrecordsBusiness").text (<%=ret.displaycount%>);
refresh();
</script>
@@ -73,7 +73,7 @@
<script type="text/javascript">
totalrecordsService=<%=ret.totalrecords%>;
$("#totalrecordsService").text(totalrecordsService);
$("#offsetService").text(<%=offset%>);
$("#offsetService").val(<%=offset%>);
$("#displayrecordsService").text (<%=ret.displaycount%>);
refresh();
</script>
@@ -28,7 +28,7 @@
<!DOCTYPE html>
<%
UddiHub x = UddiHub.getInstance(application, request.getSession());
int maxrecords = 50;
int maxrecords = 1000;
int offset = 0;
String lang = request.getParameter("lang");
if (lang == null || lang.length() == 0) {
@@ -53,8 +53,8 @@
if (offset < 0) {
offset = 0;
}
if (maxrecords > 50) {
maxrecords = 50;
if (maxrecords > 1000) {
maxrecords = 1000;
}
boolean isChooser = false;
try {
@@ -24,12 +24,12 @@
<%@include file="header-top.jsp" %>
<div class="container">

<!-- Main hero unit for a primary marketing message or call to action -->

<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "navbar.publisherassertions")%></h1>
</div>

<!-- Example row of columns -->

<div class="row">
<div class="span12" >

@@ -73,12 +73,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
<script type="text/javascript" src="js/bindingeditor.js"></script>
<!-- Main hero unit for a primary marketing message or call to action -->

<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "pages.bindingeditor.title")%></h1>
</div>

<!-- Example row of columns -->

<div class="row">
<div class="span12" >

@@ -24,12 +24,12 @@
<%@include file="header-top.jsp" %>
<div class="container">

<!-- Main hero unit for a primary marketing message or call to action -->

<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "navbar.businesses")%></h1>
</div>

<!-- Example row of columns -->

<div class="row">
<div class="span12" >
<table class="table-bordered table-striped">
@@ -38,13 +38,16 @@
<table>
<tr><td><%=ResourceLoader.GetResource(session, "totals.records")%></td><td><span id="totalrecordsBusiness"></span></td></tr>
<tr><td><%=ResourceLoader.GetResource(session, "totals.recordsreturned")%></td><td><span id="displayrecordsBusiness"></span></td></tr>
<tr><td><%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><span id="offsetBusiness">0</span></td></tr>
<tr><td title="<%=ResourceLoader.GetResource(session, "totals.offset.v2disclaimer")%>">
<%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><input id="offsetBusiness" value="0"></td></tr>
</table>
</td>
<td>
<table>
<tr><td><%=ResourceLoader.GetResource(session, "items.name")%></td><td><input type="text" id="name_business" value="%" tabindex="1"></td></tr>
<tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" id="lang_business" tabindex="2"></td></tr>
<tr><td><%=ResourceLoader.GetResource(session, "totals.fetch")%></td><td><input type="number" id="fetch" value="40"></td></tr>

</table>
</td>
</tr>
@@ -32,12 +32,12 @@
<%@include file="header-top.jsp" %>
<div class="container">

<!-- Main hero unit for a primary marketing message or call to action -->

<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "pages.businesseditor.title")%></h1>
</div>

<!-- Example row of columns -->

<div class="row">
<div class="span12" >
<script type="text/javascript" src="js/businessEditor.js"></script>
@@ -40,7 +40,7 @@
<%@include file="header-top.jsp" %>
<div class="container">

<!-- Main hero unit for a primary marketing message or call to action -->

<div class="well">
<h1><%=ResourceLoader.GetResource(session, "navbar.subscriptions")%></h1>
</div>
@@ -85,7 +85,7 @@
%>

<!-- Example row of columns -->

<div class="row">
<div class="span12">
<%=ResourceLoader.GetResource(session, "pages.subscription.content")%>
@@ -25,14 +25,14 @@

<div class="container">

<!-- Main hero unit for a primary marketing message or call to action -->

<div class="hero-unit">
<h1>jUDDI</h1>
<p><%=ResourceLoader.GetResource(session, "index.juddi")%></p>
<p><a href="http://juddi.apache.org" class="btn btn-primary btn-large"><%=ResourceLoader.GetResource(session, "learnmore")%> &raquo;</a></p>
</div>

<!-- Example row of columns -->

<div class="row">
<div class="span4">
<h2><%=ResourceLoader.GetResource(session, "index.browse.title")%></h2>
@@ -29,13 +29,13 @@
<%@include file="header-top.jsp" %>
<div class="container">

<!-- Main hero unit for a primary marketing message or call to action -->

<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "navbar.create.serviceimport.wadl")%></h1>

</div>

<!-- Example row of columns -->

<div class="row">
<div class="span12" >
<%=ResourceLoader.GetResource(session, "pages.serviceimport.content.wadl")%>
@@ -29,13 +29,13 @@
<%@include file="header-top.jsp" %>
<div class="container">

<!-- Main hero unit for a primary marketing message or call to action -->

<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "navbar.create.serviceimport")%></h1>

</div>

<!-- Example row of columns -->

<div class="row">
<div class="span12" >
<%=ResourceLoader.GetResource(session, "pages.serviceimport.content")%>
@@ -24,11 +24,11 @@ RenderBusinessListBySearch('%', offsetBusiness, maxrecordsBusiness);

function pagedownBusiness()
{
offset = $("#offsetBusiness").text();
offset = $("#offsetBusiness").val();
//alert(offset);
var newoffset = offsetBusiness - maxrecordsBusiness;
if (newoffset < 0)
return;
newoffset=0;
//alert(newoffset);
if (newoffset != offsetBusiness)
{
@@ -42,7 +42,7 @@ function refreshBusinessList()
}
function pageupBusiness()
{
offsetBusiness = $("#offsetBusiness").text();
offsetBusiness = $("#offsetBusiness").val();
//alert(offset);
var fetch = maxrecordsBusiness;
if ((parseInt(offsetBusiness) + parseInt(maxrecordsBusiness)) > totalrecordsBusiness)
@@ -58,6 +58,13 @@ function pageupBusiness()
//offset, maxrecords, keyword
function RenderBusinessListBySearch(keyword1, offset1, maxrecords1)
{
var maxrecords1 = $("#fetch").val();
try{
maxrecords1 = parseInt(maxrecords1);
}catch (e){
maxrecords1=40;
}
maxrecordsBusiness=maxrecords1;
var keyword =$("#name_business").val();
var lang = $("#lang_business").text();
if (lang==undefined)
@@ -27,18 +27,18 @@ RenderServiceListBySearch('%', offsetService, maxrecordsService);
//offset += maxrecords;
function pagedownService()
{
offsetService = $("#offsetService").text();
offsetService = $("#offsetService").val();
//alert(offset);
var newoffset = offsetService - maxrecordsService;
if (newoffset < 0)
return;
newoffset=0;
//alert(newoffset);
if (newoffset != offsetService)
RenderServiceListBySearch('%', newoffset, maxrecordsService);
}
function pageupService()
{
offsetService = $("#offsetService").text();
offsetService = $("#offsetService").val();
//alert(offset);
var fetch = maxrecordsService;
if ((parseInt(offsetService) + parseInt(maxrecordsService)) > totalrecordsService)
@@ -53,6 +53,12 @@ function pageupService()

function RenderServiceListBySearch(keyword, offset, maxrecords)
{
var maxr = 10;
try {
maxr = parseInt($("#fetch").val());
} catch (e) {
}
maxrecordsService=maxr;
var keyword2 = $("#name_service_search").val();

var lang = $("#lang_service_search").val();
@@ -62,7 +68,7 @@ function RenderServiceListBySearch(keyword, offset, maxrecords)
keyword2="";
lang = encodeURIComponent(lang);
offset = encodeURIComponent(offset);
maxrecords = encodeURIComponent(maxrecords);
maxrecords = encodeURIComponent(maxrecordsService);
keyword2 = encodeURIComponent(keyword2);
$("#serviceBrowserListing").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
var request= $.ajax({
@@ -190,6 +190,10 @@ function saveService()

$("#alert_results").html('<i class="icon-2x icon-thumbs-up"></i><br>' + msg);
$("#alert").modal();




});

request.fail(function(jqXHR, textStatus) {

0 comments on commit ab72847

Please sign in to comment.