Skip to content

Reintroducing use of byCombo #153

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

Merged
merged 2 commits into from
Nov 7, 2019
Merged

Reintroducing use of byCombo #153

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21e8638
Revert "Remove code that's unused according to @timbl"
Vinnl Oct 7, 2019
ba8e223
Removing use doingDefaults, but keeping byCombo
megoth Nov 7, 2019
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
8 changes: 5 additions & 3 deletions src/acl-control.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,10 @@ UI.aclControl.ACLControlBox5 = function (subject, dom, noun, kb, callback) {
// This is the main function which produces an editable access control.
// There are two of these in all iff the defaults are separate
//
function ACLControlEditable (box, doc, aclDoc, kb, options) {
options = options || {}
var byCombo
function ACLControlEditable (box, doc, aclDoc, kb, options = {}) {
var ac = UI.acl.readACL(doc, aclDoc, kb, options.doingDefaults) // Note kb might not be normal one
var byCombo = UI.acl.ACLbyCombination(ac) // important to keep this, as removal will trigger bugs like https://github.com/solid/solid-panes/issues/193#issuecomment-549777549

var kToCombo = function (k) {
var y = ['Read', 'Append', 'Write', 'Control']
var combo = []
Expand All @@ -108,6 +109,7 @@ UI.aclControl.ACLControlBox5 = function (subject, dom, noun, kb, callback) {
combo = combo.join('\n')
return combo
}

var colloquial = {13: 'Owners', 9: 'Owners (write locked)', 5: 'Editors', 3: 'Posters', 2: 'Submitters', 1: 'Viewers'}
var recommended = {13: true, 5: true, 3: true, 2: true, 1: true}
var explanation = {
Expand Down