Skip to content
This repository was archived by the owner on Apr 13, 2023. It is now read-only.

Commit 93bce24

Browse files
author
Matt Karl
committed
Standardized the permissions display, fixed bugs
1 parent d50e087 commit 93bce24

File tree

9 files changed

+69
-50
lines changed

9 files changed

+69
-50
lines changed

‎app/routes/groups/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ router.post('/', function(req, res)
4949
// Remove all users
5050
User.removeGroup(null, group._id, done);
5151
},
52-
function(num, raw, done)
52+
function(num, done)
5353
{
5454
// Add new users, if any
5555
var users = req.body.user;
5656
if (!users) done(null);
5757
User.addGroup(users, group._id, done);
5858
},
59-
function(num, raw, done)
59+
function(num, done)
6060
{
6161
if (req.body.refreshToken)
6262
{

‎app/views/groups/add.jade‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,24 @@ append content
2727
.form-group
2828
label.col-sm-3.control-label(for="privilege") Privilege
2929
.col-sm-9
30-
.radio: label
31-
input(type="radio" name="privilege" value="0" checked)
32-
| Normal
33-
span.help-inline Default user privilege
34-
.radio: label
35-
input(type="radio" name="privilege" value="1")
36-
| Producer
37-
span.help-inline Ability to manage games
38-
.radio: label
39-
input(type="radio" name="privilege" value="2")
40-
| Admin
41-
span.help-inline Ability to manage games, users and groups
30+
table.table.no-margin.table-striped.table-bordered
31+
thead: tr
32+
th.text-center Read
33+
|
34+
a(href="#" data-placement="top" data-toggle="popover" data-trigger="focus" data-content="Default group privilege")
35+
span.glyphicon.glyphicon-question-sign
36+
th.text-center Write
37+
|
38+
a(href="#" data-placement="top" data-toggle="popover" data-trigger="focus" data-content="Ability to manage games")
39+
span.glyphicon.glyphicon-question-sign
40+
th.text-center Admin
41+
|
42+
a(href="#" data-placement="top" data-toggle="popover" data-trigger="focus" data-content="Ability to manage games, users and groups")
43+
span.glyphicon.glyphicon-question-sign
44+
tbody: tr
45+
td.text-center: input(name="privilege" value="0" type="radio" checked=true)
46+
td.text-center: input(name="privilege" value="1" type="radio")
47+
td.text-center: input(name="privilege" value="2" type="radio")
4248
.form-group
4349
label.col-sm-3.control-label(for="tokenExpires") Access
4450
.col-sm-9

‎app/views/groups/edit.jade‎

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,24 @@ append content
2727
.form-group
2828
label.col-sm-3.control-label(for="privilege") Privilege
2929
.col-sm-9
30-
.radio: label
31-
input(type="radio" name="privilege" value="0" checked=(group.privilege == 0))
32-
| Normal
33-
span.help-inline Default user privilege
34-
.radio: label
35-
input(type="radio" name="privilege" value="1" checked=(group.privilege == 1))
36-
| Producer
37-
span.help-inline Ability to manage games
38-
.radio: label
39-
input(type="radio" name="privilege" value="2" checked=(group.privilege == 2))
40-
| Admin
41-
span.help-inline Ability to manage games, users and groups
30+
table.table.no-margin.table-striped.table-bordered
31+
thead: tr
32+
th.text-center Read
33+
|
34+
a(href="#" data-placement="top" data-toggle="popover" data-trigger="focus" data-content="Default group privilege")
35+
span.glyphicon.glyphicon-question-sign
36+
th.text-center Write
37+
|
38+
a(href="#" data-placement="top" data-toggle="popover" data-trigger="focus" data-content="Ability to manage games")
39+
span.glyphicon.glyphicon-question-sign
40+
th.text-center Admin
41+
|
42+
a(href="#" data-placement="top" data-toggle="popover" data-trigger="focus" data-content="Ability to manage games, users and groups")
43+
span.glyphicon.glyphicon-question-sign
44+
tbody: tr
45+
td.text-center: input(name="privilege" value="0" type="radio" checked=(group.privilege == 0))
46+
td.text-center: input(name="privilege" value="1" type="radio" checked=(group.privilege == 1))
47+
td.text-center: input(name="privilege" value="2" type="radio" checked=(group.privilege == 2))
4248
.form-group
4349
label.col-sm-3.control-label Access
4450
.col-sm-9
@@ -67,11 +73,12 @@ append content
6773
.form-group
6874
label.col-sm-3.control-label(for="user") Add Users
6975
.col-sm-9
70-
ul.list-group.search-results
71-
for u in users
72-
li.list-group-item.search-result=u.name
73-
input(type="hidden" name="user" value=u.id)
74-
button.close ×
76+
if users.length > 0
77+
ul.list-group.search-results
78+
for u in users
79+
li.list-group-item.search-result=u.name
80+
input(type="hidden" name="user" value=u.id)
81+
button.close ×
7582
input.form-control#userSearch(type="text" data-search="/users/search" data-list="#userSearchDisplay" autocomplete="off")
7683
.dropdown.search#userSearchDisplay
7784
ul.dropdown-menu

‎app/views/groups/group.jade‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ append title
66
append content
77
.col-sm-12
88
if user.privilege == privilege.admin
9-
form.pull-right(method="post" action="/groups/edit")
9+
form.pull-right(method="post" action="/groups")
1010
button.btn.btn-sm.btn-default.pull-right(type="submit" name="groupId" value=group._id)
1111
span.glyphicon.glyphicon-pencil
1212
| Edit

‎app/views/groups/modal-game.jade‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
.modal-body
1212
table.table.table-striped.table-bordered
1313
thead: tr
14-
th.text-center Normal
14+
th.text-center Read
1515
|
1616
a(href="#" data-placement="top" data-toggle="popover" data-trigger="focus" data-content="Group can access games but not edit or add releases")
1717
span.glyphicon.glyphicon-question-sign
18-
th.text-center Producer
18+
th.text-center Write
1919
|
2020
a(href="#" data-placement="top" data-toggle="popover" data-trigger="focus" data-content="Group can manage releases and game properties")
2121
span.glyphicon.glyphicon-question-sign
2222
th.text-center Admin
2323
|
24-
a(href="#" data-placement="top" data-toggle="popover" data-trigger="focus" data-content="Group has Producer privileges but can manage game privileges as well")
24+
a(href="#" data-placement="top" data-toggle="popover" data-trigger="focus" data-content="Group has write access and can manage game privileges")
2525
span.glyphicon.glyphicon-question-sign
2626
tbody: tr
2727
td.text-center: input(name="permission" value="0" type="radio" checked=true)

‎app/views/users/add.jade‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,24 @@ append content
4141
.form-group
4242
label.control-label.col-sm-3 Global Privilege
4343
.col-sm-9
44-
.radio: label
45-
input(type='radio' name='privilege' value="0" checked=true)
46-
| Read
47-
span.help-inline Default user privilege
48-
.radio: label
49-
input(type='radio' name='privilege' value="1")
50-
| Write
51-
span.help-inline Ability to manage games
52-
.radio: label
53-
input(type='radio' name='privilege' value="2")
54-
| Admin
55-
span.help-inline Ability to manage games, users and groups
44+
table.table.table-striped.table-bordered
45+
thead: tr
46+
th.text-center Read
47+
|
48+
a(href="#" data-placement="top" data-toggle="popover" data-trigger="focus" data-content="Default user privilege")
49+
span.glyphicon.glyphicon-question-sign
50+
th.text-center Write
51+
|
52+
a(href="#" data-placement="top" data-toggle="popover" data-trigger="focus" data-content="Ability to manage games")
53+
span.glyphicon.glyphicon-question-sign
54+
th.text-center Admin
55+
|
56+
a(href="#" data-placement="top" data-toggle="popover" data-trigger="focus" data-content="Ability to manage games, users and groups")
57+
span.glyphicon.glyphicon-question-sign
58+
tbody: tr
59+
td.text-center: input(name="privilege" value="0" type="radio" checked=true)
60+
td.text-center: input(name="privilege" value="1" type="radio")
61+
td.text-center: input(name="privilege" value="2" type="radio")
5662
.form-group.form-actions.text-center
5763
.col-sm-9.col-sm-offset-3
5864
button.btn.btn-lg.btn-primary(type='submit') Add User

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "SpringRollConnect",
3-
"version": "1.0.12",
3+
"version": "1.0.13",
44
"dependencies": {
55
"jquery": "*",
66
"bootstrap": "*",

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.0.12",
2+
"version": "1.0.13",
33
"private": true,
44
"devDependencies": {
55
"grunt": "^0.4.5",

‎project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "SpringRollConnect",
3-
"version": "1.0.12",
3+
"version": "1.0.13",
44
"main": [
55
"src/plugins/*.js",
66
"src/widgets/*.js",

0 commit comments

Comments
 (0)