Merge "Fix POST users api"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
1b8ab3b4af
|
|
@ -209,7 +209,7 @@ select option[value=""], select.form-control option[value=""] {
|
|||
.border-radius-4 {
|
||||
border-radius: 4px !important;
|
||||
}
|
||||
textarea, input[type="text"], input[type="password"], input[type="number"] {
|
||||
textarea, input[type="text"], input[type="password"], input[type="number"], input[type="email"] {
|
||||
-webkit-appearance: none;
|
||||
/* Remove inner shadow from inputs on mobile iOS */
|
||||
/*background: inherit;*/
|
||||
|
|
|
|||
|
|
@ -463,7 +463,6 @@ compassAppDev.run(function($httpBackend, settings, $http) {
|
|||
var userSetting = [{
|
||||
"id": 1,
|
||||
"email": "admin@compass.org",
|
||||
"username": "admin",
|
||||
"first_name": "",
|
||||
"last_name": "",
|
||||
"active": false,
|
||||
|
|
@ -473,7 +472,6 @@ compassAppDev.run(function($httpBackend, settings, $http) {
|
|||
}, {
|
||||
"id": 2,
|
||||
"email": "tsinghua@compass.org",
|
||||
"username": "tsinghua",
|
||||
"first_name": "",
|
||||
"last_name": "",
|
||||
"active": true,
|
||||
|
|
@ -483,7 +481,6 @@ compassAppDev.run(function($httpBackend, settings, $http) {
|
|||
}, {
|
||||
"id": 3,
|
||||
"email": "ann@compass.org",
|
||||
"username": "ann",
|
||||
"first_name": "Ann",
|
||||
"last_name": "",
|
||||
"active": true,
|
||||
|
|
@ -493,7 +490,6 @@ compassAppDev.run(function($httpBackend, settings, $http) {
|
|||
}, {
|
||||
"id": 4,
|
||||
"email": "john@compass.org",
|
||||
"username": "jsmith",
|
||||
"first_name": "John",
|
||||
"last_name": "Smitch",
|
||||
"active": true,
|
||||
|
|
@ -503,7 +499,6 @@ compassAppDev.run(function($httpBackend, settings, $http) {
|
|||
}, {
|
||||
"id": 5,
|
||||
"email": "tom@compass.org",
|
||||
"username": "tom",
|
||||
"first_name": "Tom",
|
||||
"last_name": "Jones",
|
||||
"active": true,
|
||||
|
|
|
|||
|
|
@ -5,41 +5,33 @@
|
|||
<div class="modal-body padding-bottom-0">
|
||||
<form name="newUserForm" class="form-horizontal">
|
||||
<div class="form-group new-user-form" ng-class="{'has-error': newUserForm.useremail.$invalid && newUserForm.useremail.$dirty}">
|
||||
<input type="email" name="useremail" placeholder="Email" class="input-width-200" ng-model="newUser.email" required>
|
||||
<i class="fa fa-envelope opacity-50 margin-left-neg30"></i>
|
||||
<input type="email" name="useremail" placeholder="Email" class="input-width-200" ng-model="newUser.email" required>
|
||||
<i class="fa fa-envelope opacity-50 margin-left-neg30"></i>
|
||||
<div class="margin-left-15 inline">
|
||||
<span class="red">*</span>
|
||||
<span class="red" ng-show="newUserForm.useremail.$error.email"> Invalid Email</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group new-user-form" ng-class="{'has-error': newUserForm.userName.$invalid && newUserForm.userName.$dirty}">
|
||||
<input type="text" ng-model="newUser.username" name="userName" placeholder="Username" class="input-width-200" required>
|
||||
<i class="fa fa-user opacity-50 margin-left-neg30 padding-left-1"></i>
|
||||
<div class="margin-left-17 inline">
|
||||
<span class="red">*</span>
|
||||
</div>
|
||||
<div class="form-group new-user-form">
|
||||
<input type="text" ng-model="newUser.first_name" name="userfirstname" placeholder="First Name" class="input-width-200">
|
||||
</div>
|
||||
|
||||
<div class="form-group new-user-form">
|
||||
<input type="text" ng-model="newUser.first_name" name="userfirstname" placeholder="First Name" class="input-width-200">
|
||||
</div>
|
||||
|
||||
<div class="form-group new-user-form">
|
||||
<input type="text" ng-model="newUser.last_name" name="userlastname" placeholder="Last Name" class="input-width-200">
|
||||
<input type="text" ng-model="newUser.last_name" name="userlastname" placeholder="Last Name" class="input-width-200">
|
||||
</div>
|
||||
|
||||
<div class="form-group new-user-form" ng-class="{'has-error': newUserForm.userPassword.$invalid && newUserForm.userPassword.$dirty}">
|
||||
<input type="password" ng-model="newUser.password" name="userPassword" placeholder="Password" class="input-width-200" required>
|
||||
<i class="fa fa-lock opacity-50 margin-left-neg30 padding-left-2"></i>
|
||||
<input type="password" ng-model="newUser.password" name="userPassword" placeholder="Password" class="input-width-200" required>
|
||||
<i class="fa fa-lock opacity-50 margin-left-neg30 padding-left-2"></i>
|
||||
<div class="margin-left-18 inline">
|
||||
<span class="red">*</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group new-user-form" ng-class="{'has-error': newUserForm.confirmPassword.$invalid && newUserForm.confirmPassword.$dirty}">
|
||||
<input type="password" ng-model="newUser.confirmPassword" data-match="newUser.password" name="confirmPassword" placeholder="Repeat Password" class="input-width-200" required>
|
||||
<i class="fa fa-retweet opacity-50 margin-left-neg30"></i>
|
||||
<input type="password" ng-model="confirmPassword" data-match="newUser.password" name="confirmPassword" placeholder="Repeat Password" class="input-width-200" required>
|
||||
<i class="fa fa-retweet opacity-50 margin-left-neg30"></i>
|
||||
<div class="margin-left-14 inline">
|
||||
<span class="red">*</span>
|
||||
<span data-ng-show="newUserForm.confirmPassword.$error.match"> Passwords do not match</span>
|
||||
|
|
@ -48,13 +40,15 @@
|
|||
<div class="form-group new-user-form">
|
||||
<label>
|
||||
<input class="ace" type="checkbox" name="active" ng-model="newUser.active"><span class="lbl"> active</span></div>
|
||||
</label>
|
||||
</label>
|
||||
<div class="form-group new-user-form">
|
||||
<label>
|
||||
<input class="ace" type="checkbox" name="admin" ng-model="newUser.is_admin"><span class="lbl"> admin</span>
|
||||
</label>
|
||||
<label>
|
||||
<input class="ace" type="checkbox" name="admin" ng-model="newUser.is_admin"><span class="lbl"> admin</span>
|
||||
</label>
|
||||
</div>
|
||||
<p class="user-form-note">Note: Items marked with <span class="red">*</span> are required fields.</p>
|
||||
<p class="user-form-note">
|
||||
Note: Items marked with <span class="red">*</span> are required fields.
|
||||
</p>
|
||||
</form>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
|
|
|
|||
|
|
@ -25,53 +25,28 @@
|
|||
<table ng-table="tableParams" class="ng-table table table-striped table-hover nowrap">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="sortable" ng-class="{
|
||||
'sort-asc': tableParams.isSortBy('email', 'asc'),
|
||||
'sort-desc': tableParams.isSortBy('email', 'desc')}" ng-click="tableParams.sorting({'email' : tableParams.isSortBy('email', 'asc') ? 'desc' : 'asc'})">
|
||||
<th class="sortable" ng-class="{'sort-asc': tableParams.isSortBy('email', 'asc'),'sort-desc': tableParams.isSortBy('email', 'desc')}" ng-click="tableParams.sorting({'email' : tableParams.isSortBy('email', 'asc') ? 'desc' : 'asc'})">
|
||||
<div>
|
||||
E-mail
|
||||
</div>
|
||||
</th>
|
||||
<th class="sortable" ng-class="{
|
||||
'sort-asc': tableParams.isSortBy('username', 'asc'),
|
||||
'sort-desc': tableParams.isSortBy('uesrname', 'desc')
|
||||
}" ng-click="tableParams.sorting({'username' : tableParams.isSortBy('username', 'asc') ? 'desc' : 'asc'})">
|
||||
<div>
|
||||
Username
|
||||
</div>
|
||||
</th>
|
||||
<th class="sortable" ng-class="{
|
||||
'sort-asc': tableParams.isSortBy('first_name', 'asc'),
|
||||
'sort-desc': tableParams.isSortBy('first_name', 'desc')
|
||||
}" ng-click="tableParams.sorting({'first_name' : tableParams.isSortBy('first_name', 'asc') ? 'desc' : 'asc'})">
|
||||
<th class="sortable" ng-class="{'sort-asc': tableParams.isSortBy('first_name', 'asc'),'sort-desc': tableParams.isSortBy('first_name', 'desc')}" ng-click="tableParams.sorting({'first_name' : tableParams.isSortBy('first_name', 'asc') ? 'desc' : 'asc'})">
|
||||
<div>
|
||||
First Name
|
||||
</div>
|
||||
</th>
|
||||
<th class="sortable" ng-class="{
|
||||
'sort-asc': tableParams.isSortBy('last_name', 'asc'),
|
||||
'sort-desc': tableParams.isSortBy('last_name', 'desc')
|
||||
}" ng-click="tableParams.sorting({'last_name' : tableParams.isSortBy('last_name', 'asc') ? 'desc' : 'asc'})">
|
||||
<th class="sortable" ng-class="{'sort-asc': tableParams.isSortBy('last_name', 'asc'),'sort-desc': tableParams.isSortBy('last_name', 'desc')}" ng-click="tableParams.sorting({'last_name' : tableParams.isSortBy('last_name', 'asc') ? 'desc' : 'asc'})">
|
||||
<div>
|
||||
Last Name
|
||||
</div>
|
||||
</th>
|
||||
<th class="sortable" ng-class="{
|
||||
'sort-asc': tableParams.isSortBy('active', 'asc'),
|
||||
'sort-desc': tableParams.isSortBy('active', 'desc')
|
||||
}" ng-click="tableParams.sorting({'active' : tableParams.isSortBy('active', 'asc') ? 'desc' : 'asc'})">
|
||||
<th class="sortable" ng-class="{'sort-asc': tableParams.isSortBy('active', 'asc'),'sort-desc': tableParams.isSortBy('active', 'desc')}" ng-click="tableParams.sorting({'active' : tableParams.isSortBy('active', 'asc') ? 'desc' : 'asc'})">
|
||||
<div>Active</div>
|
||||
</th>
|
||||
<th class="sortable" ng-class="{
|
||||
'sort-asc': tableParams.isSortBy('is_admin', 'asc'),
|
||||
'sort-desc': tableParams.isSortBy('is_admin', 'desc')
|
||||
}" ng-click="tableParams.sorting({'is_admin' : tableParams.isSortBy('is_admin', 'asc') ? 'desc' : 'asc'})">
|
||||
<th class="sortable" ng-class="{'sort-asc': tableParams.isSortBy('is_admin', 'asc'),'sort-desc': tableParams.isSortBy('is_admin', 'desc')}" ng-click="tableParams.sorting({'is_admin' : tableParams.isSortBy('is_admin', 'asc') ? 'desc' : 'asc'})">
|
||||
<div>Admin</div>
|
||||
</th>
|
||||
<th class="sortable" ng-class="{
|
||||
'sort-asc': tableParams.isSortBy('last_login', 'asc'),
|
||||
'sort-desc': tableParams.isSortBy('last_login', 'desc')
|
||||
}" ng-click="tableParams.sorting({'last_login' : tableParams.isSortBy('last_login', 'asc') ? 'desc' : 'asc'})">
|
||||
<th class="sortable" ng-class="{'sort-asc': tableParams.isSortBy('last_login', 'asc'),'sort-desc': tableParams.isSortBy('last_login', 'desc')}" ng-click="tableParams.sorting({'last_login' : tableParams.isSortBy('last_login', 'asc') ? 'desc' : 'asc'})">
|
||||
<div>Last Login</div>
|
||||
</th>
|
||||
<th>Actions</th>
|
||||
|
|
@ -82,9 +57,6 @@
|
|||
<td sortable="'email'">
|
||||
{{userSetting.email}}
|
||||
</td>
|
||||
<td sortable="'username'">
|
||||
{{userSetting.username}}
|
||||
</td>
|
||||
<td sortable="'first_name'">
|
||||
{{userSetting.first_name}}
|
||||
</td>
|
||||
|
|
@ -143,22 +115,13 @@
|
|||
<table ng-table="userParams" class="ng-table table table-striped table-hover nowrap">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="sortable" ng-class="{
|
||||
'sort-asc': userParams.isSortBy('user_id', 'asc'),
|
||||
'sort-desc': userParams.isSortBy('user_id', 'desc')
|
||||
}" ng-click="userParams.sorting({'user_id' : userParams.isSortBy('user_id', 'asc') ? 'desc' : 'asc'})">
|
||||
<th class="sortable" ng-class="{'sort-asc': userParams.isSortBy('user_id', 'asc'),'sort-desc': userParams.isSortBy('user_id', 'desc')}" ng-click="userParams.sorting({'user_id' : userParams.isSortBy('user_id', 'asc') ? 'desc' : 'asc'})">
|
||||
<div>User ID</div>
|
||||
</th>
|
||||
<th class="sortable" ng-class="{
|
||||
'sort-asc': userParams.isSortBy('action', 'asc'),
|
||||
'sort-desc': userParams.isSortBy('action', 'desc')
|
||||
}" ng-click="userParams.sorting({'action' : userParams.isSortBy('action', 'asc') ? 'desc' : 'asc'})">
|
||||
<th class="sortable" ng-class="{'sort-asc': userParams.isSortBy('action', 'asc'),'sort-desc': userParams.isSortBy('action', 'desc')}" ng-click="userParams.sorting({'action' : userParams.isSortBy('action', 'asc') ? 'desc' : 'asc'})">
|
||||
<div>Action</div>
|
||||
</th>
|
||||
<th class="sortable" ng-class="{
|
||||
'sort-asc': userParams.isSortBy('timestamp', 'asc'),
|
||||
'sort-desc': userParams.isSortBy('timestamp', 'desc')
|
||||
}" ng-click="userParams.sorting({'timestamp' : userParams.isSortBy('timestamp', 'asc') ? 'desc' : 'asc'})">
|
||||
<th class="sortable" ng-class="{'sort-asc': userParams.isSortBy('timestamp', 'asc'),'sort-desc': userParams.isSortBy('timestamp', 'desc')}" ng-click="userParams.sorting({'timestamp' : userParams.isSortBy('timestamp', 'asc') ? 'desc' : 'asc'})">
|
||||
<div>Timestamp</div>
|
||||
</th>
|
||||
</tr>
|
||||
|
|
@ -180,4 +143,4 @@
|
|||
</table>
|
||||
</div>
|
||||
</tab>
|
||||
</div>
|
||||
</div>
|
||||
Loading…
Reference in New Issue