Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Changeset 4168

Show
Ignore:
Timestamp:
05/11/08 20:38:46 (4 months ago)
Author:
bwolfe
Message:

Fixing location editing and encounter viewing

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openmrs/trunk/src/api/org/openmrs/propertyeditor/LocationEditor.java

    r4095 r4168  
    4949                Location t = (Location) getValue(); 
    5050                if (t == null && Context.isAuthenticated()) { 
    51                         return Context.getAuthenticatedUser().getUserProperty(OpenmrsConstants.USER_PROPERTY_DEFAULT_LOCATION); 
     51                        return null; //return Context.getAuthenticatedUser().getUserProperty(OpenmrsConstants.USER_PROPERTY_DEFAULT_LOCATION); 
    5252                } 
    5353                else { 

  • openmrs/trunk/src/web/org/openmrs/web/controller/encounter/EncounterFormController.java

    r4095 r4168  
    215215                        // loop over the encounter's observations to find the edited obs 
    216216                        String reason = ""; 
    217                         for (Obs o : encounter.getObsAtTopLevel(false)) { 
     217                        for (Obs o : encounter.getObsAtTopLevel(true)) { 
    218218                                // only the voided obs have been edited 
    219219                                if (o.isVoided()){