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/02/12 02:25:43 UTC

svn commit: r1567486 - in /juddi/trunk/juddi-gui/src/main: resources/org/apache/juddi/webconsole/resources/web.properties resources/org/apache/juddi/webconsole/resources/web_es.properties webapp/businessEditor2.jsp webapp/serviceEditor.jsp

Author: alexoree
Date: Wed Feb 12 01:25:42 2014
New Revision: 1567486

URL: http://svn.apache.org/r1567486
Log:
JUDDI-821 fixed

Modified:
    juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
    juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
    juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp
    juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp

Modified: juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties?rev=1567486&r1=1567485&r2=1567486&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties (original)
+++ juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties Wed Feb 12 01:25:42 2014
@@ -431,3 +431,5 @@ orAllKeys=This changes the behavior for 
 signaturePresent=This is used with any find_xx API to restrict the result set to entities which either contain an XML Digital Signature element, or are contained in an entity which contains one.
 exactMatch=Signifies that only entries with names, keyValues and keyNames (where applicable) that exactly match the name argument passed in, after normalization, will be returned.
 diacriticSensitiveMatch=Signifies that the matching behavior for name, keyValue and keyName (where applicable) should be performed with regard to diacritics. This is the default behavior.
+items.service.nobinding=Please save the service first, then you can add bindings.
+items.business.noservice=Please save the business first, then you can add services.

Modified: juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties?rev=1567486&r1=1567485&r2=1567486&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties (original)
+++ juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties Wed Feb 12 01:25:42 2014
@@ -434,3 +434,5 @@ orAllKeys=Esto cambia el comportamiento 
 signaturePresent=Se utiliza con cualquier API find_xx para restringir el conjunto de resultados a las entidades que, o bien contienen un elemento XML Digital Signature, o contenidos en una entidad que contiene una.
 exactMatch=Significa que s\u00f3lo las entradas con nombres, keyValues \u200b\u200by nombres de clave (en su caso) que coincide exactamente con el nombre del argumento que se pasa en, despu\u00e9s de la normalizaci\u00f3n, se devolver\u00e1n.
 diacriticSensitiveMatch=Significa que el comportamiento de la coincidencia de nombre, keyValue y keyName (en su caso) se debe realizar con respecto a los signos diacr\u00edticos. Este es el comportamiento predeterminado.
+items.service.nobinding=Por favor, guarde el servicio en primer lugar, a continuaci\u00f3n, usted puede a\u00f1adir enlaces.
+items.business.noservice=Por favor, guarde el negocio en primer lugar, a continuaci\u00f3n, puede agregar servicios.

Modified: juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp?rev=1567486&r1=1567485&r2=1567486&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp Wed Feb 12 01:25:42 2014
@@ -472,21 +472,18 @@
                   <br><br>
                </div>
                <div class="tab-pane " id="services">
-                  <b><%=ResourceLoader.GetResource(session, "pages.businesseditor.businesslist")%> </b>- 
+                  <b><%=ResourceLoader.GetResource(session, "pages.businesseditor.businesslist")%> </b> - 
                   <%
                      if (bd.getBusinessServices() != null) {
                         out.write(Integer.toString(bd.getBusinessServices().getBusinessService().size()));
                      } else {
-                        out.write("0");
+                        out.write("0 ");
                      }
                   %> <%=ResourceLoader.GetResource(session, "pages.businesseditor.businesslist2")%>
                   <%if (!newitem) {
                   %>
                   <br>
                   <a href="serviceEditor.jsp?bizid=<%=URLEncoder.encode(bd.getBusinessKey(), "UTF-8")%>"><i class="icon-plus-sign icon-large"></i> <%=ResourceLoader.GetResource(session, "items.service.add")%> </a>
-                  <%
-                     }
-                  %>
                   <br>
                   <table class="table table-hover"><tr>
                         <th><%=ResourceLoader.GetResource(session, "items.name")%> </th>
@@ -521,6 +518,14 @@
                         }
                      %>
                   </table>
+                                    <%
+                     }
+                  else
+                  {
+                       out.write("<br><div class=\"alert alert-error\">" + ResourceLoader.GetResource(session, "items.business.noservice") + "</div>");
+                  }
+                  %>
+
 
                </div>
                <div class="tab-pane" id="signatures"><b><%=ResourceLoader.GetResource(session, "items.dsigs")%></b>

Modified: juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp?rev=1567486&r1=1567485&r2=1567486&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp Wed Feb 12 01:25:42 2014
@@ -346,8 +346,14 @@
 
                                         <div class="tab-pane" id="bindingtemplates">
                                                 <b><%=ResourceLoader.GetResource(session, "items.bindingtemplate")%> </b>- <%=ResourceLoader.GetResource(session, "items.bindingtemplate.description")%> <br>
+                                                <% if (!newitem) {
+                                                %>
                                                 <a href="bindingEditor.jsp?svcid=<%=URLEncoder.encode(bd.getServiceKey(), "UTF8")%>"><i class="icon-plus-sign icon-large"></i></a> <%=ResourceLoader.GetResource(session, "items.bindingtemplate.add")%> <Br>
+                                                
                                                         <%
+                                                }
+                                                else
+                                                     out.write("<br><div class=\"alert alert-error\">" + ResourceLoader.GetResource(session, "items.service.nobinding") + "</div><br>");
                                                                 if (bd.getBindingTemplates() != null && !bd.getBindingTemplates().getBindingTemplate().isEmpty()) {
                                                         %>
                                                 <table class="table table-hover">



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