You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2014/11/02 01:17:14 UTC

[3/3] git commit: JUDDI-885 fixed

JUDDI-885 fixed


Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/36e9b7fe
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/36e9b7fe
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/36e9b7fe

Branch: refs/heads/master
Commit: 36e9b7fe6fdfefe169d8182e0310d189102c7d3b
Parents: 618fa4b
Author: alexoree <al...@apache.org>
Authored: Sat Nov 1 20:16:59 2014 -0400
Committer: alexoree <al...@apache.org>
Committed: Sat Nov 1 20:16:59 2014 -0400

----------------------------------------------------------------------
 .../org/apache/juddi/webconsole/resources/web.properties     | 1 +
 .../org/apache/juddi/webconsole/resources/web_es.properties  | 1 +
 juddi-gui/src/main/webapp/ajax/deletebinding.jsp             | 4 ++++
 juddi-gui/src/main/webapp/bindingEditor.jsp                  | 8 +++++++-
 4 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/juddi/blob/36e9b7fe/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
----------------------------------------------------------------------
diff --git a/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties b/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
index 81a2dcf..106e855 100644
--- a/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
+++ b/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
@@ -436,3 +436,4 @@ items.business.noservice=Please save the business first, then you can add servic
 actions.popout=Popout
 items.categorizations=Categorizations
 items.categorizations.uddi=UDDI Categorizations
+actions.return=Return

http://git-wip-us.apache.org/repos/asf/juddi/blob/36e9b7fe/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
----------------------------------------------------------------------
diff --git a/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties b/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
index 61ebda9..31a64b3 100644
--- a/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
+++ b/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
@@ -439,3 +439,4 @@ items.business.noservice=Por favor, guarde el negocio en primer lugar, a continu
 actions.popout=Salir
 items.categorizations=Categorizaciones
 items.categorizations.uddi=UDDI Categorizaciones
+actions.return=Volver

http://git-wip-us.apache.org/repos/asf/juddi/blob/36e9b7fe/juddi-gui/src/main/webapp/ajax/deletebinding.jsp
----------------------------------------------------------------------
diff --git a/juddi-gui/src/main/webapp/ajax/deletebinding.jsp b/juddi-gui/src/main/webapp/ajax/deletebinding.jsp
index 66452df..2cc21dd 100644
--- a/juddi-gui/src/main/webapp/ajax/deletebinding.jsp
+++ b/juddi-gui/src/main/webapp/ajax/deletebinding.jsp
@@ -4,6 +4,7 @@
     Author     : Alex O'Ree
 --%>
 
+<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
 <%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
 <%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
@@ -14,10 +15,13 @@
         if (request.getMethod().equalsIgnoreCase("POST")) {
                 UddiHub x = UddiHub.getInstance(application, request.getSession());
                 String msg = (x.deleteBinding(request.getParameter("id")));
+                String svcid = ((request.getParameter("svcid")));
                 if (msg.contains(ResourceLoader.GetResource(session, "errors.generic"))) {
                         response.setStatus(406);
                 }
                 out.write(msg);
+                if (svcid!=null)
+                        out.write("<a href=\"serviceEditor.jsp?id=" + StringEscapeUtils.escapeHtml(svcid.trim()) + "\">" +ResourceLoader.GetResource(session, "actions.return") +"</a>");
         }
 
 %>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/juddi/blob/36e9b7fe/juddi-gui/src/main/webapp/bindingEditor.jsp
----------------------------------------------------------------------
diff --git a/juddi-gui/src/main/webapp/bindingEditor.jsp b/juddi-gui/src/main/webapp/bindingEditor.jsp
index a4e1983..a0699c7 100644
--- a/juddi-gui/src/main/webapp/bindingEditor.jsp
+++ b/juddi-gui/src/main/webapp/bindingEditor.jsp
@@ -682,8 +682,14 @@
                               var postbackdata = new Array();
                                       postbackdata.push({
                                               name: "id",
-                                              value: $("#" + "<%=PostBackConstants.BINDINGKEY%>").text()
+                                              value: $("#" + "<%=PostBackConstants.BINDINGKEY%>").text().trim()
                                       });
+                                      postbackdata.push({
+                                              name: "svcid",
+                                              value: $("#" + "<%=PostBackConstants.SERVICEKEY %>").text().trim()
+                                      });
+                                      
+                                      
                               
                               postbackdata.push({
                                       name: "nonce",


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org