Skip to content
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.

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

LBAC-7 Added fix to select the session locaion in the location selector #9

Merged
merged 1 commit into from Jul 9, 2018

Conversation

@suthagar23
Copy link
Member

@suthagar23 suthagar23 commented Jul 9, 2018

Description

Currently, the first item is selected default to the fragment location selector. This PR contains the fix to select the session location as the default location to the location selector in the fragment.

Ticket

Ticket : https://issues.openmrs.org/browse/LBAC-7

@suthagar23 suthagar23 force-pushed the suthagar23:LBAC-7 branch from 9de4e4b to 31540d7 Jul 9, 2018
@@ -22,6 +23,11 @@ public void controller(FragmentModel model,
model.addAttribute("activeLocations", activeLocations);

model.addAttribute("selectedLocationUuid", null);
String sessionLocationId = session.getAttribute(UiSessionContext.LOCATION_SESSION_ATTRIBUTE).toString();

This comment has been minimized.

@dkayiwa

dkayiwa Jul 9, 2018
Member

What happens when session.getAttribute returns null?

This comment has been minimized.

@suthagar23

suthagar23 Jul 9, 2018
Author Member

Added fix to check for null also.

@suthagar23 suthagar23 force-pushed the suthagar23:LBAC-7 branch from 31540d7 to 08dc9a0 Jul 9, 2018
@@ -19,6 +19,12 @@
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>appui-omod</artifactId>

This comment has been minimized.

@dkayiwa

dkayiwa Jul 9, 2018
Member

What do we need this for?

This comment has been minimized.

@suthagar23

suthagar23 Jul 9, 2018
Author Member

Yes, No need it here, Applied through the parent pom.xml

Changed version of the appui module

Added a minor fix

Added a minor fix
@suthagar23 suthagar23 force-pushed the suthagar23:LBAC-7 branch from 08dc9a0 to 90286a4 Jul 9, 2018
@@ -72,6 +72,12 @@
<version>${uiframeworkVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openmrs.module</groupId>

This comment has been minimized.

@dkayiwa

dkayiwa Jul 9, 2018
Member

And what do we need this for?

This comment has been minimized.

@suthagar23

suthagar23 Jul 9, 2018
Author Member

Without groupId how can I add a dependency to my module?

This comment has been minimized.

@dkayiwa

dkayiwa Jul 9, 2018
Member

I mean the entire dependency.

This comment has been minimized.

@suthagar23

suthagar23 Jul 9, 2018
Author Member

I'm using this in the module - see here(https://github.com/openmrs/openmrs-module-locationbasedaccess/pull/9/files#diff-0fa526dc98f8f95f9a0cceef8fdd699cR8)
Without this dependency, I can't even compile also

@dkayiwa dkayiwa merged commit 7408ac2 into openmrs:master Jul 9, 2018
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants