RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Email functionality bug fixes.

Browse source
This commit is contained in:
Vova Perebykivskiy 2015-12-04 17:27:39 +02:00 • committed by Dgray16
parent 6aaae08f42
commit d856912acf
7 changed files with 50 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libreplan-business/src/main/java/org/libreplan/business/common/entities/PredefinedConnectors.java
View file

@ -57,6 +57,7 @@ public enum PredefinedConnectors {
ConnectorProperty.create(PredefinedConnectorProperties.PROTOCOL, ""),
ConnectorProperty.create(PredefinedConnectorProperties.HOST, ""),
ConnectorProperty.create(PredefinedConnectorProperties.PORT, ""),
ConnectorProperty.create(PredefinedConnectorProperties.EMAIL_SENDER, ""),
ConnectorProperty.create(PredefinedConnectorProperties.EMAIL_USERNAME, ""),
ConnectorProperty.create(PredefinedConnectorProperties.EMAIL_PASSWORD, "")

28
libreplan-business/src/main/java/org/libreplan/business/email/daos/EmailTemplateDAO.java
View file

@ -59,7 +59,7 @@ public class EmailTemplateDAO extends GenericDAOHibernate<EmailTemplate, Long> i
List<EmailTemplate> emailTemplates = list(EmailTemplate.class);
for ( int i = 0; i < emailTemplates.size(); i++)
// language.ordinal.equals(3) - English
if ( emailTemplates.get(i).getType().ordinal() == 0 && emailTemplates.get(i).getLanguage().ordinal() == 3)
if ( emailTemplates.get(i).getType().ordinal() == 0 && emailTemplates.get(i).getLanguage().ordinal() == 3 )
return emailTemplates.get(i).getSubject();
}catch (Exception e){}
@ -70,9 +70,8 @@ public class EmailTemplateDAO extends GenericDAOHibernate<EmailTemplate, Long> i
@Override
public String getContentBySelectedLanguage(int languageOrdinal, int emailTemplateTypeOrdinal) {
for (int i = 0; i < list(EmailTemplate.class).size(); i++)
if (list(EmailTemplate.class).get(i).getLanguage().ordinal() == languageOrdinal &&
// emailTemplateTypeOrdinal + 1, because first value is 0
list(EmailTemplate.class).get(i).getType().ordinal() == emailTemplateTypeOrdinal + 1)
if ( list(EmailTemplate.class).get(i).getLanguage().ordinal() == languageOrdinal &&
list(EmailTemplate.class).get(i).getType().ordinal() == emailTemplateTypeOrdinal )
return list(EmailTemplate.class).get(i).getContent();
return "";
}
@ -80,11 +79,28 @@ public class EmailTemplateDAO extends GenericDAOHibernate<EmailTemplate, Long> i
@Override
public String getContentBySelectedTemplate(int emailTemplateTypeOrdinal, int languageOrdinal) {
for (int i = 0; i < list(EmailTemplate.class).size(); i++)
// emailTemplateTypeOrdinal + 1, because first value is 0
if ( list(EmailTemplate.class).get(i).getType().ordinal() == emailTemplateTypeOrdinal + 1 &&
if ( list(EmailTemplate.class).get(i).getType().ordinal() == emailTemplateTypeOrdinal &&
list(EmailTemplate.class).get(i).getLanguage().ordinal() == languageOrdinal )
return list(EmailTemplate.class).get(i).getContent();
return "";
}
@Override
public String getSubjectBySelectedLanguage(int languageOrdinal, int emailTemplateTypeOrdinal) {
for (int i = 0; i < list(EmailTemplate.class).size(); i++)
if ( list(EmailTemplate.class).get(i).getLanguage().ordinal() == languageOrdinal &&
list(EmailTemplate.class).get(i).getType().ordinal() == emailTemplateTypeOrdinal )
return list(EmailTemplate.class).get(i).getSubject();
return "";
}
@Override
public String getSubjectBySelectedTemplate(int emailTemplateTypeOrdinal, int languageOrdinal) {
for (int i = 0; i < list(EmailTemplate.class).size(); i++)
if ( list(EmailTemplate.class).get(i).getType().ordinal() == emailTemplateTypeOrdinal &&
list(EmailTemplate.class).get(i).getLanguage().ordinal() == languageOrdinal )
return list(EmailTemplate.class).get(i).getSubject();
return "";
}
}

3
libreplan-business/src/main/java/org/libreplan/business/email/daos/IEmailTemplateDAO.java
View file

@ -41,4 +41,7 @@ public interface IEmailTemplateDAO extends IGenericDAO<EmailTemplate, Long>{
String getContentBySelectedLanguage(int languageOrdinal, int emailTemplateTypeOrdinal);
String getContentBySelectedTemplate(int emailTemplateTypeOrdinal, int languageOrdinal);
String getSubjectBySelectedLanguage(int languageOrdinal, int emailTemplateTypeOrdinal);
String getSubjectBySelectedTemplate(int emailTemplateTypeOrdinal, int languageOrdinal);
}

2
libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
View file

@ -1325,7 +1325,6 @@ public class ConfigurationController extends GenericForwardComposer {
}
private boolean isEmailFieldsValid(){
if ( protocolsCombobox.getSelectedItem().getLabel().equals("STARTTLS") &&
emailUsernameTextbox.getValue() != null &&
emailPasswordTextbox.getValue() != null &&
@ -1336,5 +1335,4 @@ public class ConfigurationController extends GenericForwardComposer {
else return false;
}
}

9
libreplan-webapp/src/main/java/org/libreplan/web/email/EmailTemplateController.java
View file

@ -108,6 +108,7 @@ public class EmailTemplateController extends GenericForwardComposer{
public void setSelectedLanguage(Language language){
emailTemplateModel.setLanguage(language);
getSubjectDataBySelectedLanguage();
getContentDataBySelectedLanguage();
}
@ -139,6 +140,7 @@ public class EmailTemplateController extends GenericForwardComposer{
public void setSelectedEmailTemplateEnum(EmailTemplateEnum emailTemplateEnum){
emailTemplateModel.setEmailTemplateEnum(emailTemplateEnum);
getSubjectDataBySelectedTemplate();
getContentDataBySelectedTemplate();
}
@ -177,4 +179,11 @@ public class EmailTemplateController extends GenericForwardComposer{
private void getContentDataBySelectedTemplate(){
contentsTextbox.setValue( emailTemplateModel.getContentBySelectedTemplate( getSelectedEmailTemplateEnum().ordinal(), getSelectedLanguage().ordinal() ) );
}
private void getSubjectDataBySelectedLanguage(){
subjectTextbox.setValue(emailTemplateModel.getSubjectBySelectedLanguage(getSelectedLanguage().ordinal(), getSelectedEmailTemplateEnum().ordinal()));
}
private void getSubjectDataBySelectedTemplate(){
subjectTextbox.setValue( emailTemplateModel.getContentBySelectedTemplate( getSelectedEmailTemplateEnum().ordinal(), getSelectedLanguage().ordinal() ) );
}
}

12
libreplan-webapp/src/main/java/org/libreplan/web/email/EmailTemplateModel.java
View file

@ -157,6 +157,18 @@ public class EmailTemplateModel implements IEmailTemplateModel {
public String getContentBySelectedTemplate(int emailTemplateTypeOrdinal, int languageOrdinal) {
return emailTemplateDAO.getContentBySelectedTemplate(emailTemplateTypeOrdinal, languageOrdinal);
}
@Override
@Transactional
public String getSubjectBySelectedLanguage(int languageOrdinal, int emailTemplateTypeOrdinal) {
return emailTemplateDAO.getSubjectBySelectedLanguage(languageOrdinal, emailTemplateTypeOrdinal);
}
@Override
@Transactional
public String getSubjectBySelectedTemplate(int emailTemplateTypeOrdinal, int languageOrdinal) {
return emailTemplateDAO.getSubjectBySelectedTemplate(emailTemplateTypeOrdinal, languageOrdinal);
}
}

3
libreplan-webapp/src/main/java/org/libreplan/web/email/IEmailTemplateModel.java
View file

@ -46,6 +46,9 @@ public interface IEmailTemplateModel {
String getContentBySelectedLanguage(int languageOrdinal, int emailTemplateTypeOrdinal);
String getContentBySelectedTemplate(int emailTemplateTypeOrdinal, int languageOrdinal);
String getSubjectBySelectedLanguage(int languageOrdinal, int emailTemplateTypeOrdinal);
String getSubjectBySelectedTemplate(int emailTemplateTypeOrdinal, int languageOrdinal);
String getContent();
void setContent(String content);