tanshu/brewman
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed: Create user

Browse Source 
Fixed: Delete client
This commit is contained in:
Amritanshu
2013-10-30 11:23:48 +05:30
parent 3fe3a7f7f3
commit 76c7a7218b
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
brewman/static/partial/client-detail.html
View File

@ -36,7 +36,7 @@
<div class="form-group">
<div class="col-md-offset-2 col-md-10">
<button class="btn btn-primary" ng-click="save()">Save</button>
<button class="btn btn-danger" ng-show="client.ClientID" ng-click="confirm">Delete</button>
<button class="btn btn-danger" ng-show="client.ClientID" ng-click="confirm()">Delete</button>
</div>
</div>
</form>
</form>

2
brewman/static/scripts/client.js
View File

@ -17,7 +17,7 @@ ClientListCtrl.resolve = {
}]
};
var ClientCtrl = ['$scope', '$location', 'client', function ($scope, $location, client) {
var ClientCtrl = ['$scope', '$location', '$modal', 'client', function ($scope, $location, $modal, client) {
$scope.client = client;
$scope.save = function () {

19
brewman/views/auth/user.py
View File

@ -12,15 +12,15 @@ from brewman.models.auth import User, Group
from brewman.models.validation_exception import TryCatchFunction, ValidationError
class view_user(object):
class UserView(object):
def __init__(self, request):
self.request = request
self.user = authenticated_userid(request)
self.permissions = None
self.HasPermission = False
self.has_permission = False
if self.user is not None:
self.user = User.by_id(self.user)
self.HasPermission = 'Users' in groupfinder(self.user.id, request)
self.has_permission = 'Users' in groupfinder(self.user.id, request)
@view_config(route_name='user_list', renderer='brewman:templates/angular_base.mako', permission='Users')
@view_config(request_method='GET', route_name='user_id', renderer='brewman:templates/angular_base.mako',
@ -32,8 +32,12 @@ class view_user(object):
@view_config(request_method='POST', route_name='api_user', renderer='json', permission='Users')
@TryCatchFunction
def save(self):
return self.save_user()
@TryCatchFunction
def save_user(self):
user = User(self.request.json_body['Name'], self.request.json_body['Password'],
self.request.json_body['LockedOut'])
DBSession.add(user)
@ -56,7 +60,7 @@ class view_user(object):
def update_user(self, user):
if user is None:
raise ValidationError('User name / id not found')
if self.HasPermission:
if self.has_permission:
user.name = self.request.json_body['Name']
user.locked_out = self.request.json_body['LockedOut']
self.add_groups(user, self.request.json_body['Groups'])
@ -107,7 +111,8 @@ class view_user(object):
return users
@view_config(request_method='GET', route_name='api_user', renderer='json', request_param='names', permission='Authenticated')
@view_config(request_method='GET', route_name='api_user', renderer='json', request_param='names',
permission='Authenticated')
def show_name(self):
list = User.query().filter(User.locked_out == False).order_by(User.name).all()
users = [{'Name': item.name} for item in list]
@ -128,7 +133,7 @@ class view_user(object):
else:
user = User.by_name(id)
if self.HasPermission:
if self.has_permission:
account = {'UserID': user.id, 'Name': user.name, 'Password': '', 'LockedOut': user.locked_out, 'Groups': []}
for item in Group.list():
account['Groups'].append(