Skip to content

Commit 7b02c48

Browse files
committed
Adjust permission order to more clarly
1 parent be76961 commit 7b02c48

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

lib/models/note.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var logger = require("../logger.js");
2323
var ot = require("../ot/index.js");
2424

2525
// permission types
26-
var permissionTypes = ["freely", "editable", "locked", "private", "limited", "protected"];
26+
var permissionTypes = ["freely", "editable", "limited", "private", "protected", "locked"];
2727

2828
module.exports = function (sequelize, DataTypes) {
2929
var Note = sequelize.define("Note", {

public/js/index.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2287,22 +2287,22 @@ function updatePermission(newPermission) {
22872287
label = '<i class="fa fa-shield"></i> Editable';
22882288
title = "Signed people can edit";
22892289
break;
2290-
case "locked":
2291-
label = '<i class="fa fa-lock"></i> Locked';
2292-
title = "Only owner can edit";
2290+
case "limited":
2291+
label = '<i class="fa fa-shield"></i> Limited';
2292+
title = "Signed people can view & edit"
22932293
break;
22942294
case "private":
22952295
label = '<i class="fa fa-hand-stop-o"></i> Private';
22962296
title = "Only owner can view & edit";
22972297
break;
2298-
case "limited":
2299-
label = '<i class="fa fa-hand-shield"></i> Limited';
2300-
title = "Signed people can view and edit"
2301-
break;
23022298
case "protected":
23032299
label = '<i class="fa fa-hand-stop-o"></i> Protected';
23042300
title = "Signed people can view";
23052301
break;
2302+
case "locked":
2303+
label = '<i class="fa fa-lock"></i> Locked';
2304+
title = "Only owner can edit";
2305+
break;
23062306
}
23072307
if (personalInfo.userid && owner && personalInfo.userid == owner) {
23082308
label += ' <i class="fa fa-caret-down"></i>';

public/views/body.ejs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
<ul class="dropdown-menu" aria-labelledby="permissionLabel">
1818
<li class="ui-permission-freely"<% if(!allowAnonymous) { %> style="display: none;"<% } %>><a><i class="fa fa-leaf fa-fw"></i> Freely - Anyone can edit</a></li>
1919
<li class="ui-permission-editable"><a><i class="fa fa-shield fa-fw"></i> Editable - Signed people can edit</a></li>
20-
<li class="ui-permission-locked"><a><i class="fa fa-lock fa-fw"></i> Locked - Only owner can edit</a></li>
21-
<li class="ui-permission-private"><a><i class="fa fa-hand-stop-o fa-fw"></i> Private - Only owner can view &amp; edit</a></li>
2220
<li class="ui-permission-limited"><a><i class="fa fa-shield fa-fw"></i> Limited - Signed people can edit &amp; view</a></li>
21+
<li class="ui-permission-private"><a><i class="fa fa-hand-stop-o fa-fw"></i> Private - Only owner can view &amp; edit</a></li>
2322
<li class="ui-permission-protected"><a><i class="fa fa-hand-stop-o fa-fw"></i> Protected - Only owner can edit</a></li>
23+
<li class="ui-permission-locked"><a><i class="fa fa-lock fa-fw"></i> Locked - Only owner can edit</a></li>
2424
<li class="divider"></li>
2525
<li class="ui-delete-note"><a><i class="fa fa-trash-o fa-fw"></i> Delete this note</a></li>
2626
</ul>

0 commit comments

Comments
 (0)