vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-25 15:37:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Bug WISE-16 fixed. Backed completed."

Browse Source 
This reverts commit 9a77ff3bb8.
This commit is contained in:
Paulo Gustavo Veiga 2014-01-10 00:21:21 -03:00
parent 5f29024559
commit 50adfa0053
4 changed files with 5 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java
View File

@ -18,9 +18,7 @@
package com.wisemapping.rest; package com.wisemapping.rest;
import com.wisemapping.exceptions.WiseMappingException;
import com.wisemapping.mail.NotificationService; import com.wisemapping.mail.NotificationService;
import com.wisemapping.model.Collaboration;
import com.wisemapping.model.Mindmap; import com.wisemapping.model.Mindmap;
import com.wisemapping.model.User; import com.wisemapping.model.User;
import com.wisemapping.rest.model.RestLogItem; import com.wisemapping.rest.model.RestLogItem;
@ -33,13 +31,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseStatus;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.List;
@Controller @Controller
public class AccountController extends BaseController { public class AccountController extends BaseController {
@ -106,21 +100,6 @@ public class AccountController extends BaseController {
userService.updateUser(user); userService.updateUser(user);
} }
@RequestMapping(method = RequestMethod.DELETE, value = "account", consumes = {"text/plain"})
@ResponseStatus(value = HttpStatus.NO_CONTENT)
public void deleleteUser() throws WiseMappingException
{
final User user = Utils.getUser(true);
final List<Collaboration> collaborations = mindmapService.findCollaborations(user);
for (Collaboration collaboration : collaborations) {
final Mindmap mindmap = collaboration.getMindMap();
mindmapService.removeMindmap(mindmap,user);
}
userService.deleteUser(user);
}
@RequestMapping(method = RequestMethod.POST, value = "logger/editor", consumes = {"application/xml", "application/json"}, produces = {"application/json", "text/html", "application/xml"}) @RequestMapping(method = RequestMethod.POST, value = "logger/editor", consumes = {"application/xml", "application/json"}, produces = {"application/json", "text/html", "application/xml"})
@ResponseStatus(value = HttpStatus.NO_CONTENT) @ResponseStatus(value = HttpStatus.NO_CONTENT)
public void logError(@RequestBody RestLogItem item, @NotNull HttpServletRequest request) { public void logError(@RequestBody RestLogItem item, @NotNull HttpServletRequest request) {

9
wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java
View File

@ -117,18 +117,11 @@ public class AdminController extends BaseController {
@RequestMapping(method = RequestMethod.DELETE, value = "admin/users/{id}", consumes = {"text/plain"}) @RequestMapping(method = RequestMethod.DELETE, value = "admin/users/{id}", consumes = {"text/plain"})
@ResponseStatus(value = HttpStatus.NO_CONTENT) @ResponseStatus(value = HttpStatus.NO_CONTENT)
public void deleteUserByEmail(@PathVariable long id) throws WiseMappingException { public void getUserByEmail(@PathVariable long id) throws WiseMappingException {
final User user = userService.getUserBy(id); final User user = userService.getUserBy(id);
if (user == null) { if (user == null) {
throw new IllegalArgumentException("User '" + id + "' could not be found"); throw new IllegalArgumentException("User '" + id + "' could not be found");
} }
final List<Collaboration> collaborations = mindmapService.findCollaborations(user);
for (Collaboration collaboration : collaborations) {
final Mindmap mindmap = collaboration.getMindMap();
mindmapService.removeMindmap(mindmap,user);
}
userService.deleteUser(user); userService.deleteUser(user);
} }

13
wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java
View File

@ -21,11 +21,7 @@ package com.wisemapping.service;
import com.wisemapping.dao.UserManager; import com.wisemapping.dao.UserManager;
import com.wisemapping.exceptions.WiseMappingException; import com.wisemapping.exceptions.WiseMappingException;
import com.wisemapping.mail.NotificationService; import com.wisemapping.mail.NotificationService;
import com.wisemapping.model.AccessAuditory; import com.wisemapping.model.*;
import com.wisemapping.model.AuthenticationType;
import com.wisemapping.model.Collaborator;
import com.wisemapping.model.Mindmap;
import com.wisemapping.model.User;
import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.app.VelocityEngine;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@ -33,11 +29,8 @@ import org.springframework.context.MessageSource;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.ui.velocity.VelocityEngineUtils; import org.springframework.ui.velocity.VelocityEngineUtils;
import java.util.Calendar; import java.io.IOException;
import java.util.HashMap; import java.util.*;
import java.util.Locale;
import java.util.Map;
import java.util.UUID;
public class UserServiceImpl public class UserServiceImpl
implements UserService { implements UserService {

23
wise-webapp/src/main/webapp/jsp/accountSettings.jsp
View File

@ -88,18 +88,6 @@
</fieldset> </fieldset>
</form> </form>
</div> </div>
<div class="tab-pane fade" id="deleteAccountPanel">
<div id="deleteAccountMsg" class="alert">
</div>
<form action="#" method="POST" id="deleteAccountForm">
<fieldset>
<label for="accountMarkedForDelete"><strong><spring:message code="NEW_PASSWORD"/>:</strong></label>
<input type="checkbox" name="confirmAccountDelete" id="confirmAccountDelete" required="required"/>
<input type="submit" id="deleteAccountBtn" class="btn btn-primary"
value="<spring:message code="DELETE__ACCOUNT"/>"/>
</fieldset>
</form>
</div>
</div> </div>
</div> </div>
@ -107,7 +95,6 @@
$('#changePasswordMsg').hide(); $('#changePasswordMsg').hide();
$('#changeInfoMsg').hide(); $('#changeInfoMsg').hide();
$('#languageMsg').hide(); $('#languageMsg').hide();
$('#deleteAccountMsg').hide();
function postChange(url, postBody, msgContainerId, successMsg) { function postChange(url, postBody, msgContainerId, successMsg) {
// Change success message ... // Change success message ...
@ -157,14 +144,4 @@
postChange("c/restful/account/locale", locale, 'languageMsg', "<spring:message code="INFO_UPDATE_SUCCESS"/>"); postChange("c/restful/account/locale", locale, 'languageMsg', "<spring:message code="INFO_UPDATE_SUCCESS"/>");
event.preventDefault(); event.preventDefault();
}); });
$('#deleteAccountForm').submit(function (event) {
var locale = $('#deleteAccountForm option:selected').val();
postChange("c/restful/account/locale", locale, 'languageMsg', "<spring:message code="INFO_UPDATE_SUCCESS"/>");
event.preventDefault();
});
</script> </script>