Changeset 7750

Timestamp:

25/11/10 09:30:06 (10 years ago)

Author:

mnagni

Message:

The ProviderAdminEmail? was neither fully correctly created nor displayed.

File:

• RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/executor/ExecuteDoNewProvider.java (modified) (4 diffs)

RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/executor/ExecuteDoNewProvider.java

@@ -72 +72 @@
                         if (aemail.getID() != null)
                                 email.setId(aemail.getID());
+                        email.setAdminEmail(true);
                         provider.getProviderEmails().add(email);
                 }               
@@ -98 +99 @@
                 ProviderCommonType common = pdetails.getProviderCommon();               
                 provider.setBaseUrl(common.getProviderURL());
-                provider.setEmailToAdmin(common.isSetProviderAdminEmail());
+                provider.setEmailToAdmin(common.getProviderAdminEmail().isMonitor());
                 provider.setName(common.getProviderName());
                 prepareProviderEmails(common, provider);
@@ -141 +142 @@
                 for (ProviderEmail item : contacts){
                         email = getOf().createEmailContactType();
+                        email.setEmail(item.getEmail());
+                        email.setName(item.getRealName());
+                        email.setID(item.getId());
                         
                         if (item.getAdminEmail()) {
@@ -146 +150 @@
                                 adminEmail.setMonitor(provider.getEmailToAdmin());
                                 adminEmail.setEmailContact(email);
+                                common.setProviderAdminEmail(adminEmail);
+                                continue;
                         }
-                        
-                        email.setEmail(item.getEmail());
-                        email.setName(item.getRealName());
-                        email.setID(item.getId());
+
                         common.getProviderContacts().add(email);
                 }