Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4681fd37fc4c
Choose a base ref
...
head repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ae21c2c2749a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 26, 2014

  1. TRUNK-3335 Retired Provider Attribute Types should not be shown when … 

    …adding/editing providers
    @ShubhamRai
    ShubhamRai committed Feb 26, 2014
    Copy the full SHA
    6ad3b89 View commit details

Commits on Mar 6, 2014

  1. Merge pull request #676 from ShubhamRai/TRUNK-3335 

    TRUNK-3335 Retired Provider Attribute Types should not be shown when add...
    @dkayiwa
    dkayiwa committed Mar 6, 2014
    Copy the full SHA
    ae21c2c View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 api/src/main/java/org/openmrs/validator/BaseCustomizableValidator.java
2 changes: 1 addition & 1 deletion api/src/main/java/org/openmrs/validator/BaseCustomizableValidator.java
View file
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ public <T extends AttributeType, A extends Attribute> void validateAttributes(Cu

// check to make sure that the target has the right number of each type of attribute
for (T at : attributeTypes) {
if (at.getMinOccurs() > 0 || at.getMaxOccurs() != null) {
if ((at.getMinOccurs() > 0 || at.getMaxOccurs() != null) && !at.isRetired()) {
int numFound = 0;
for (A attr : customizable.getActiveAttributes()) {
if (attr.getAttributeType().equals(at)) {