Merge pull request #943 from Nirothipan/master

Fixing User create form error when creating a new user. #1360
revert-70aa11f8
sinthuja 7 years ago committed by GitHub
commit 77c02fae46

@ -128,7 +128,7 @@
<i class="icon fw fw-error"></i><span></span> <i class="icon fw fw-error"></i><span></span>
</div> </div>
<h4> <h4>
An invitation mail will be sent to this user to initiate device enrollment. User added successfully.
</h4> </h4>
</div> </div>
<!-- /content --> <!-- /content -->

@ -70,7 +70,7 @@ public class EmailSenderServiceImpl implements EmailSenderService {
emailData = contentProvider.getContent(info.getTemplate(), info.getParams()); emailData = contentProvider.getContent(info.getTemplate(), info.getParams());
if(EmailSenderDataHolder.getInstance().getConfigurationContextService() if(EmailSenderDataHolder.getInstance().getConfigurationContextService()
.getServerConfigContext().getAxisConfiguration().getTransportOut(transportSenderName) == null){ .getServerConfigContext().getAxisConfiguration().getTransportOut(transportSenderName) == null){
throw new EmailSendingFailedException("Email transport is not configured."); log.warn("Email invitation is not sent as the email is not configured.");
} }
} catch (ContentProcessingInterruptedException e) { } catch (ContentProcessingInterruptedException e) {
throw new EmailSendingFailedException("Error occurred while retrieving email content to be " + throw new EmailSendingFailedException("Error occurred while retrieving email content to be " +

Loading…
Cancel
Save