svn commit: r1559961 - in /openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template: RequestContactConfirmTemplate.html RequestContactConfirmTemplate.java

[vdegtyarev]

Author: vdegtyarev
Date: Tue Jan 21 10:17:07 2014
New Revision: 1559961

URL: http://svn.apache.org/r1559961
Log:
OPENMEETINGS-871 minor changes. Internal error is not thrown for request 
contact conformation.

Modified:
    
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactConfirmTemplate.html
    
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactConfirmTemplate.java

Modified: 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactConfirmTemplate.html
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactConfirmTemplate.html?rev=1559961&r1=1559960&r2=1559961&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactConfirmTemplate.html
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactConfirmTemplate.html
 Tue Jan 21 10:17:07 2014
@@ -24,8 +24,5 @@
        <br/>
        <span wicket:id="firstName"></span>&nbsp;<span 
wicket:id="lastName"></span>&nbsp;<wicket:ommessage key="1193"/><br/>
        <wicket:ommessage key="1194"/><br/>
-       <br/>
-       <br/>
-       <a wicket:id="link"><wicket:ommessage key="1196"/></a><br/>
 </wicket:panel>
 </html>
\ No newline at end of file

Modified: 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactConfirmTemplate.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactConfirmTemplate.java?rev=1559961&r1=1559960&r2=1559961&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactConfirmTemplate.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactConfirmTemplate.java
 Tue Jan 21 10:17:07 2014
@@ -29,8 +29,8 @@ public class RequestContactConfirmTempla
                super(id);
                add(new Label("firstName", user.getFirstname()));
                add(new Label("lastName", user.getLastname()));
-               add(new Label("contactFirstName", 
contact.getContact().getFirstname()));
-               add(new Label("contactLastName", 
contact.getContact().getLastname()));
+               add(new Label("addedFirstName", 
contact.getContact().getFirstname()));
+               add(new Label("addedLastName", 
contact.getContact().getLastname()));
        }
        
        public static String getEmail(User user, UserContact contact) {