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.

Sign up for GitHub

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

Jump to bottom

Implement deleting of users and administrative tweaks #54

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Implement deleting of users and administrative tweaks #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a780637
Implement deleting of users
onurv13 Sep 30, 2014
3e051aa
Make admins and mods able to change usernames and full names, tweak v…
onurv13 Sep 30, 2014
ecc9b16
Merge pull request #53 from tobiasmuecksch/master
tobiasmuecksch Oct 2, 2014
209e470
Update README.md
tobiasmuecksch Oct 3, 2014
69950d5
Implement deleting of users
onurv13 Sep 30, 2014
49cd9c4
Make admins and mods able to change usernames and full names, tweak v…
onurv13 Sep 30, 2014
c7e7542
Merge branch 'master' of https://github.com/onurv12/frontend
onurv13 Oct 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
- Sass
- Compass

// TODO: list all dependencies

## Development
### Installation
1. Install node dependencies
Expand All @@ -20,6 +18,3 @@
### Helpful commands
- Automatic Sass deployment
- `grunt dev`

## Documentation
// TODO
8 changes: 7 additions & 1 deletion js/controller/editProfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
app.controller("editProfileController", function ($scope, $rootScope, $routeParams, userlistFactory, userFactory, notificationFactory, hashService, $route) {
app.controller("editProfileController", function ($scope, $rootScope, $routeParams, userlistFactory, userFactory, notificationFactory, hashService, $route, $location) {
var userID = $routeParams.userID;
$rootScope.updateHeader();
$scope.administratorLoggedIn = false;
$scope.moderatorLoggedIn = false;
$scope.selfLoggedIn = false;
$scope.readOnly = {username: true, fullName: true, email: true, gravatar: true, role: true};
$scope.changeVer = {username: true, fullName: true, email: true, gravatar: true, role: true, password: true};
$scope.passChangeable = false;
Expand All @@ -13,6 +14,7 @@ app.controller("editProfileController", function ($scope, $rootScope, $routePara
$scope.fetchUser = function(size) {
userlistFactory.getUser(userID).then(function(data) {
$scope.user = data;
$scope.selfLoggedIn = userFactory.getUserData()["ID"] == userID;
$scope.gravatar = "http://www.gravatar.com/avatar/" + hashService.MD5($scope.user.GravatarEmail) + ".jpg?s=" + size;
if($scope.user.isAdmin == "1") {
if($scope.user.isDeleteable == "0") {
Expand Down Expand Up @@ -51,6 +53,10 @@ app.controller("editProfileController", function ($scope, $rootScope, $routePara
}
$route.reload();
};
$scope.deleteUser = function(userID) {
userlistFactory.deleteUser(userID);
$location.path("/userlist");
};
$scope.getRoleFromUser = function(user) {
if (user && user.isAdmin == 1) {
if (user.isDeleteable == 1) {
Expand Down
10 changes: 10 additions & 0 deletions js/factories/userlist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,15 @@
}
});
};
object.deleteUser = function(userID) {
$http
.delete(settingsFactory.backendUrl + "user/" + userID)
.success(function(data) {
notificationFactory.success({content: "User is successfully deleted"});
})
.error(function(data, status) {
notificationFactory.error({title:"Error:", content: "Server error occurred with status code: " + status + " and response: " + data});
});
};
return object;
});;
28 changes: 17 additions & 11 deletions partials/editProfile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,36 @@ <h1>My Profile</h1>
<p><a href="http://www.gravatar.com">Change Picture</a></p>
</div>
<form id="userForm" name="UserForm" role="form" novalidate>
<div class="form-group">
<div class="form-group" ng-class="{'has-success': readOnly['username'] == false && UserForm.Username.$dirty && UserForm.Username.$valid, 'has-error': readOnly['username'] == false && UserForm.Username.$dirty && UserForm.Username.$invalid}">
<label class="control-label">Username</label>
<div class="input-group">
<input type="text" class="form-control" value="{{user.Name}}" readonly>
<input type="text" class="form-control" name="Username" ng-model="user.Name" ng-readonly="readOnly['username']">
<span class="input-group-btn">
<button class="btn btn-default" type="button" ng-click="toggleButton('username')" ng-show="changeVer['username']" ng-disabled="(getDropdownForUser(user).length <= 1 && !selfLoggedIn) || !moderatorLoggedIn">Change</button>
</span>
<span class="input-group-btn">
<button class="btn btn-default" type="button" disabled>Change</button>
<button class="btn btn-default" type="button" ng-click="toggleButton('username'); updateUser(user.ID, 'Username', user.Name)" ng-hide="changeVer['username']">Save</button>
</span>
</div>
</div>
<div class="form-group">
<label class="control-label">Full Name</label>
<label class="control-label" ng-class="{'has-success': readOnly['fullName'] == false && UserForm.FullName.$dirty && UserForm.FullName.$valid, 'has-error': readOnly['fullName'] == false && UserForm.FullName.$dirty && UserForm.FullName.$invalid}">Full Name</label>
<div class="input-group">
<input type="text" class="form-control" value="{{user.Fullname}}" readonly>
<input type="text" class="form-control" name="FullName" ng-model="user.Fullname" ng-readonly="readOnly['fullName']">
<span class="input-group-btn">
<button class="btn btn-default" type="button" ng-click="toggleButton('fullName')" ng-show="changeVer['fullName']" ng-disabled="getDropdownForUser(user).length <= 1 && !selfLoggedIn">Change</button>
</span>
<span class="input-group-btn">
<button class="btn btn-default" type="button" disabled>Change</button>
<button class="btn btn-default" type="button" ng-click="toggleButton('fullName'); updateUser(user.ID, 'FullName', user.Fullname)" ng-hide="changeVer['fullName']">Save</button>
</span>
</div>
</div>
<div class="form-group" ng-class="{'has-success': readOnly['email'] == false && UserForm.Email.$dirty && UserForm.Email.$valid, 'has-error': readOnly['email'] == false && UserForm.Email.$dirty && UserForm.Email.$invalid}">
<label class="control-label">Email</label>
<div class="input-group">
<!-- TODO: make existing emails invalid-->
<input type="text" class="form-control" name="Email" ng-model="user.Email" ng-readonly="readOnly['email']">
<span class="input-group-btn">
<button class="btn btn-default" type="button" ng-click="toggleButton('email')" ng-show="changeVer['email']">Change</button>
<button class="btn btn-default" type="button" ng-click="toggleButton('email')" ng-show="changeVer['email']" ng-disabled="getDropdownForUser(user).length <= 1 && !selfLoggedIn">Change</button>
</span>
<span class="input-group-btn">
<button class="btn btn-default" type="button" ng-click="toggleButton('email'); updateUser(user.ID, 'Email', user.Email)" ng-hide="changeVer['email']">Save</button>
Expand All @@ -41,7 +46,7 @@ <h1>My Profile</h1>
<div class="input-group">
<input type="text" class="form-control" name="GravatarEmail" ng-model="user.GravatarEmail" ng-readonly="readOnly['gravatar']">
<span class="input-group-btn">
<button class="btn btn-default" type="button" ng-click="toggleButton('gravatar')" ng-show="changeVer['gravatar']">Change</button>
<button class="btn btn-default" type="button" ng-click="toggleButton('gravatar')" ng-show="changeVer['gravatar']" ng-disabled="getDropdownForUser(user).length <= 1 && !selfLoggedIn">Change</button>
</span>
<span class="input-group-btn">
<button class="btn btn-default" type="button" ng-click="toggleButton('gravatar'); updateUser(user.ID, 'GravatarEmail', user.GravatarEmail)" ng-hide="changeVer['gravatar']">Save</button>
Expand All @@ -61,9 +66,10 @@ <h1>My Profile</h1>
</div>
</div>
<div class="form-group">
<button class="btn btn-default" type="button" ng-click="togglePassword(); toggleButton('password')" ng-show="changeVer['password']">Change Password</button>
<button class="btn btn-default" type="button" ng-click="togglePassword(); toggleButton('password')" ng-show="changeVer['password']" ng-disabled="getDropdownForUser(user).length <= 1 && !selfLoggedIn">Change Password</button>
<button class="btn btn-default" type="button" ng-click="togglePassword(); toggleButton('password')" ng-show="!changeVer['password']">Cancel</button>
<a href="#user/{{user.ID}}"><button class="btn btn-default" type="button">Back To Profile</button></a>
<a href="#user/{{user.ID}}"><button class="btn btn-default" type="button">To Profile Page</button></a>
<button class="btn btn-danger" type="button" style="float: right;" ng-click="deleteUser(user.ID)" ng-show="moderatorLoggedIn && (getDropdownForUser(user).length > 1 || selfLoggedIn)">Delete User</button>
</div>
</form>
<form role="form" novalidate name="passForm" style="width: 50%" ng-submit="updateUser(user.ID, 'Password', newPassword)" ng-show="passChangeable">
Expand Down