Merge branch 'fix-manually-deleting-aai-users' of JulianKniephoff/ope…

…ncast into r/14.x

Pull request opencast#5756
Fixes opencast#5753
  Fix deleting user references from the admin UI

modules/admin-ui/src/main/java/org/opencastproject/adminui/endpoint/UsersEndpoint.java

@@ -162,6 +162,15 @@ public void setSecurityService(SecurityService securityService) {
     this.securityService = securityService;
   }
 
+  /**
+   * @param jpaUserReferenceProvider
+   *          the user provider to set
+   */
+  @Reference
+  public void setJpaUserReferenceProvider(JpaUserReferenceProvider jpaUserReferenceProvider) {
+    this.jpaUserReferenceProvider = jpaUserReferenceProvider;
+  }
+
   /**
    * @param jpaUserAndRoleProvider
    *          the user provider to set
@@ -439,7 +448,7 @@ public Response deleteUser(@PathParam("username") String username) throws NotFou
 
     try {
       try {
-        jpaUserAndRoleProvider.deleteUser(username, organization.getId());
+        jpaUserReferenceProvider.deleteUser(username, organization.getId());
       } catch (NotFoundException e) {
         userReferenceNotFound = true;
       }