Skip to content

FLAG-19 : Exception when Saving Flag Without Message #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RishavR wants to merge 1 commit into
base: master
Choose a base branch
from
Open

FLAG-19 : Exception when Saving Flag Without Message #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion api/src/main/resources/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,5 @@ patientflags.errors.noPriorityName=Priority name is required
patientflags.errors.noRank=Rank is required
patientflags.errors.priorityNameTooLong=Name can only be 255 characters in length
patientflags.errors.styleTooLong=Style can only be 255 characters in length
patientflags.errors.invalidUsername=No user with that username
patientflags.errors.invalidUsername=No user with that username
Copy link
Member

@dkayiwa dkayiwa Apr 23, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Has the above line got anything to do with this ticket?

patientflags.errors.noMessage= Message is required
1 change: 1 addition & 0 deletions api/src/main/resources/messages_fr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,5 @@ patientflags.errors.noPriorityName=Le nom de la priorité est requis
patientflags.errors.noRank=Le rang est requis
patientflags.errors.priorityNameTooLong=Un nom ne peut comporter que 255 caractères
patientflags.errors.styleTooLong=Le style ne peut comporter que 255 caractères
patientflags.errors.noMessage= Message est requis
patientflags.errors.invalidUsername=Aucun utilisateur avec ce nom d''utilisateur
2 changes: 2 additions & 0 deletions omod/src/main/java/org/openmrs/module/patientflags/web/validators/FlagValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ public void validate(Object target, Errors errors) {

// name cannot be empty
ValidationUtils.rejectIfEmptyOrWhitespace(errors, "name", "patientflags.errors.noName");
// Message cannot be empty
ValidationUtils.rejectIfEmptyOrWhitespace(errors, "message", "patientflags.errors.noMessage");

// criteria is no longer required, because of custom cases
//ValidationUtils.rejectIfEmptyOrWhitespace(errors, "criteria", "patientflags.errors.noCriteria");
Expand Down
5 changes: 3 additions & 2 deletions omod/src/main/java/org/openmrs/module/patientflags/web/validators/PriorityValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ public boolean supports(Class clazz) {
public void validate(Object target, Errors errors) {
Priority priorityToValidate = (Priority) target;

// name and rank cannot be empty
// name , message and rank cannot be empty
ValidationUtils.rejectIfEmptyOrWhitespace(errors, "name", "patientflags.errors.noPriorityName");
ValidationUtils.rejectIfEmptyOrWhitespace(errors, "rank", "patientflags.errors.noRank");

ValidationUtils.rejectIfEmptyOrWhitespace(errors, "message", "patientflags.errors.noMessage");

// make sure that the name field isn't too large
if(priorityToValidate.getName().length() > 255)
errors.rejectValue("name", "patientflags.errors.priorityNameTooLong");
Expand Down