Standardized permission names, fixed Editor permission for releases

Matt Karl · Matt Karl · commit 6ce8b38ee72b · 2015-07-22T17:18:45.000-04:00
diff --git a/app/public/js/embed.js b/app/public/js/embed.js
diff --git a/app/public/js/libraries.js b/app/public/js/libraries.js
diff --git a/app/public/js/main.js b/app/public/js/main.js
diff --git a/app/views/games/modal-group.jade b/app/views/games/modal-group.jade
@@ -12,8 +12,8 @@
 			.modal-body
 				table.table.table-striped.table-bordered
 					thead: tr
-						th.text-center Normal
-						th.text-center Producer
+						th.text-center Read
+						th.text-center Write
 						th.text-center Admin
 					tbody: tr
 						td.text-center: input(name="selectPermission" value="0" type="radio" checked=true)
diff --git a/app/views/games/modal-release.jade b/app/views/games/modal-release.jade
@@ -21,12 +21,14 @@
 								th.text-center: label(for="statusDev") Dev
 								th.text-center: label(for="statusQA") QA
 								th.text-center: label(for="statusStage") Stage
-								th.text-center: label(for="statusProd") Prod
+								if isAdmin
+									th.text-center: label(for="statusProd") Prod
 							tbody: tr
 								td: input#statusDev(type="radio" name="status" value="dev" checked=true)
 								td: input#statusQA(type="radio" name="status" value="qa")
 								td: input#statusStage(type="radio" name="status" value="stage")
-								td: input#statusProd(type="radio" name="status" value="prod")
+								if isAdmin
+									td: input#statusProd(type="radio" name="status" value="prod")
 				.form-group
 					label.col-sm-3.control-label(for="notes") Notes
 					.col-sm-9
diff --git a/app/views/games/privileges.jade b/app/views/games/privileges.jade
@@ -15,11 +15,11 @@ append gameContent
 				table.table.table-striped
 					thead: tr
 						th Group
-						th.text-center Normal
+						th.text-center Read
 							|  
 							a(href="#" data-placement="top" data-toggle="popover" data-trigger="focus" data-content="Users or groups can access games but not edit or add releases") 
 								span.glyphicon.glyphicon-question-sign
-						th.text-center Producer
+						th.text-center Write
 							|  
 							a(href="#" data-placement="top" data-toggle="popover" data-trigger="focus" data-content="Users or groups can manages releases and game properties") 
 								span.glyphicon.glyphicon-question-sign
diff --git a/app/views/games/release.jade b/app/views/games/release.jade
@@ -22,12 +22,14 @@ append gameContent
 							th.text-center: label(for="statusDev") Dev
 							th.text-center: label(for="statusQA") QA
 							th.text-center: label(for="statusStage") Stage
-							th.text-center: label(for="statusProd") Prod
+							if isAdmin
+								th.text-center: label(for="statusProd") Prod
 						tbody: tr
 							td: input#statusDev(type="radio" name="status" value="dev" checked=(release.status == "dev"))
 							td: input#statusQA(type="radio" name="status" value="qa" checked=(release.status == "qa"))
 							td: input#statusStage(type="radio" name="status" value="stage" checked=(release.status == "stage"))
-							td: input#statusProd(type="radio" name="status" value="prod" checked=(release.status == "prod"))
+							if isAdmin
+								td: input#statusProd(type="radio" name="status" value="prod" checked=(release.status == "prod"))
 			.form-group
 				label.col-sm-3.control-label(for="notes") Notes
 				.col-sm-9
diff --git a/app/views/games/releases-controls.jade b/app/views/games/releases-controls.jade
@@ -1,8 +1,9 @@
-form.controls.pull-right(action="/games/game/#{game.slug}/releases" method="post")
-	input(type="hidden" name="release" value=release._id)
-	input(type="hidden" name="action" value="removeRelease")
-	button.btn.btn-block.btn-default.dropdown-toggle(data-toggle="confirm" type="submit")
-		span.glyphicon.glyphicon-trash
+if isEditor
+	form.controls.pull-right(action="/games/game/#{game.slug}/releases" method="post")
+		input(type="hidden" name="release" value=release._id)
+		input(type="hidden" name="action" value="removeRelease")
+		button.btn.btn-block.btn-default.dropdown-toggle(data-toggle="confirm" type="submit")
+			span.glyphicon.glyphicon-trash
 form.controls.pull-right(action="/games/game/#{game.slug}/release" method="post")
 	input(type="hidden" name="release" value=release._id)
 	input(type="hidden" name="action" value="selectRelease")
diff --git a/app/views/home.jade b/app/views/home.jade
@@ -11,7 +11,7 @@ append content
 			.list-group
 				for game in games
 					a.list-group-item(href="/games/game/#{game.slug}")=game.title
-						span.hidden-xs.help-inline=game.bundleId
+						span.hidden-xs.help-inline=game.slug
 						span.badge=game.releases.length
 		form.panel.panel-default(method="post" action=url)
 			.panel-heading
diff --git a/app/views/users/add.jade b/app/views/users/add.jade
@@ -43,15 +43,15 @@ append content
 					.col-sm-9
 						.radio: label
 							input(type='radio' name='privilege' value="0" checked=true)
-							| Normal 
+							| Read 
 							span.help-inline Default user privilege
 						.radio: label
 							input(type='radio' name='privilege' value="1")
-							| Editor
+							| Write
 							span.help-inline Ability to manage games
 						.radio: label
 							input(type='radio' name='privilege' value="2")
-							| Administrator
+							| Admin
 							span.help-inline Ability to manage games, users and groups
 				.form-group.form-actions.text-center
 					.col-sm-9.col-sm-offset-3
diff --git a/app/views/users/edit.jade b/app/views/users/edit.jade
@@ -43,15 +43,15 @@ append content
 					.col-sm-9
 						.radio: label
 							input(type='radio' name='privilege' value="0" checked=(editUser.groups[0].privilege == 0))
-							| Normal 
+							| Read 
 							span.help-inline Default user privilege
 						.radio: label
 							input(type='radio' name='privilege' value="1" checked=(editUser.groups[0].privilege == 1))
-							| Editor
+							| Write
 							span.help-inline Ability to manage games
 						.radio: label
 							input(type='radio' name='privilege' value="2" checked=(editUser.groups[0].privilege == 2))
-							| Administrator
+							| Admin
 							span.help-inline Ability to manage games, users and groups
 				.form-group.form-actions.text-center
 					.col-sm-9.col-sm-offset-3
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "SpringRollConnect",
-	"version": "1.0.11",
+	"version": "1.0.12",
 	"dependencies": {
 		"jquery": "*",
 		"bootstrap": "*",
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-	"version": "1.0.11",
+	"version": "1.0.12",
 	"private": true,
 	"devDependencies": {
 		"grunt": "^0.4.5",
@@ -37,4 +37,4 @@
 	"scripts": {
 		"test": "grunt default --verbose"
 	}
-}
+}
diff --git a/project.json b/project.json
@@ -1,6 +1,6 @@
 {
 	"name": "SpringRollConnect",
-	"version": "1.0.11",
+	"version": "1.0.12",
 	"main": [
 		"src/plugins/*.js",
 		"src/widgets/*.js",
diff --git a/src/widgets/search-groups.js b/src/widgets/search-groups.js
@@ -4,8 +4,8 @@
 	var groups = $("#groups");
 	var groupTemplate = $("#groupTemplate").html();
 	var permissions = [
-		"Normal",
-		"Editor",
+		"Read",
+		"Write",
 		"Admin"
 	];
 	$("#groupSearch").on('search', function(e, group)

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,11 @@ append gameContent`
`15`	`15`	`table.table.table-striped`
`16`	`16`	`thead: tr`
`17`	`17`	`th Group`
`18`		`- th.text-center Normal`
	`18`	`+ th.text-center Read`
`19`	`19`	`\|`
`20`	`20`	`a(href="#" data-placement="top" data-toggle="popover" data-trigger="focus" data-content="Users or groups can access games but not edit or add releases")`
`21`	`21`	`span.glyphicon.glyphicon-question-sign`
`22`		`- th.text-center Producer`
	`22`	`+ th.text-center Write`
`23`	`23`	`\|`
`24`	`24`	`a(href="#" data-placement="top" data-toggle="popover" data-trigger="focus" data-content="Users or groups can manages releases and game properties")`
`25`	`25`	`span.glyphicon.glyphicon-question-sign`