dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19432
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-06-17 16:11:12 +0200
message:
  Removed account invite setting
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AccountController.java
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/useraccount/action/IsInviteTokenValidAction.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java	2015-06-17 13:37:50 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java	2015-06-17 14:11:12 +0000
@@ -184,8 +184,6 @@
 
     boolean accountRecoveryEnabled();
 
-    boolean accountInviteEnabled();
-
     boolean selfRegistrationNoRecaptcha();
 
     boolean emailEnabled();

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AccountController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AccountController.java	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AccountController.java	2015-06-17 14:11:12 +0000
@@ -217,12 +217,6 @@
 
         if ( invitedByEmail )
         {
-            if ( !systemSettingManager.accountInviteEnabled() )
-            {
-                ContextUtils.conflictResponse( response, "Account invite is not enabled" );
-                return;
-            }
-
             credentials = userService.getUserCredentialsByUsername( inviteUsername );
 
             if ( credentials == null )

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/useraccount/action/IsInviteTokenValidAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/useraccount/action/IsInviteTokenValidAction.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/useraccount/action/IsInviteTokenValidAction.java	2015-06-17 14:11:12 +0000
@@ -120,11 +120,6 @@
     @Override
     public String execute()
     {
-        if ( !systemSettingManager.accountInviteEnabled() )
-        {
-            return ERROR;
-        }
-
         userCredentials = userService.getUserCredentialsByUsername( username );
 
         if ( userCredentials == null )