reverting temporary testing changes in previous 2 commits

openmrs · Apr 26, 2013 · 7219493 · 7219493
1 parent 616f552
commit 7219493
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/api/src/main/java/org/openmrs/api/UserService.java b/api/src/main/java/org/openmrs/api/UserService.java
@@ -641,5 +641,6 @@ public List<User> getUsers(String name, List<Role> roles, boolean includeRetired
 	 * @param hasPrivilege <code>true</code> if the authenticated user has the required privilege or if it is a proxy privilege
 	 * @since 1.8.4, 1.9.1, 1.10
 	 */
+	@Transactional(readOnly = true)
 	public void notifyPrivilegeListeners(User user, String privilege, boolean hasPrivilege);
 }
diff --git a/api/src/main/java/org/openmrs/api/impl/UserServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/UserServiceImpl.java
@@ -31,7 +31,6 @@
 import org.openmrs.util.PrivilegeConstants;
 import org.openmrs.util.RoleConstants;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -629,7 +628,6 @@ public List<User> getUsers(String name, List<Role> roles, boolean includeRetired
 	 * @see UserService#notifyPrivilegeListeners(User, String, boolean)
 	 */
 	@Override
-	@Transactional(readOnly = true)
 	public void notifyPrivilegeListeners(User user, String privilege, boolean hasPrivilege) {
 		if (privilegeListeners != null) {
 			for (PrivilegeListener privilegeListener : privilegeListeners) {

diff --git a/web/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java b/web/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java
@@ -14,7 +14,6 @@
 package org.openmrs.web.controller;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.openmrs.Concept;
 import org.openmrs.ConceptComplex;
@@ -970,7 +969,6 @@ public void onSubmit_shouldRemoveAConceptMapFromAnExistingConcept() throws Excep
 	 * @verifies not save changes if there are validation errors
 	 */
 	@Test
-    @Ignore
 	@NotTransactional
 	public void onSubmit_shouldNotSaveChangesIfThereAreValidationErrors() throws Exception {
 		Integer conceptId = 792;