From 22a346805837cd7fc9afe8c9d22b40279cdf5b04 Mon Sep 17 00:00:00 2001
From: usodhi <61431818+usodhi@users.noreply.github.com>
Date: Wed, 16 Sep 2020 16:14:22 +0530
Subject: minor

---
 src/client/views/collections/CollectionLinearView.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/client')

diff --git a/src/client/views/collections/CollectionLinearView.tsx b/src/client/views/collections/CollectionLinearView.tsx
index 6d7ce629b..ae9915331 100644
--- a/src/client/views/collections/CollectionLinearView.tsx
+++ b/src/client/views/collections/CollectionLinearView.tsx
@@ -112,7 +112,7 @@ export class CollectionLinearView extends CollectionSubView(LinearDocument) {
         const backgroundColor = StrCast(this.props.Document.backgroundColor, "black");
         const color = StrCast(this.props.Document.color, "white");
 
-        const menuOpener = <label htmlFor={`${guid}`} style={{ pointerEvents: "all", cursor: "default", background: backgroundColor === color ? "black" : backgroundColor, }}
+        const menuOpener = <label htmlFor={`${guid}`} style={{ pointerEvents: "all", cursor: "pointer", background: backgroundColor === color ? "black" : backgroundColor, }}
             onPointerDown={e => e.stopPropagation()} >
             <p>{BoolCast(this.props.Document.linearViewIsExpanded) ? "–" : "+"}</p>
         </label>;
@@ -123,7 +123,7 @@ export class CollectionLinearView extends CollectionSubView(LinearDocument) {
                     {menuOpener}
                 </Tooltip>
                 <input id={`${guid}`} type="checkbox" checked={BoolCast(this.props.Document.linearViewIsExpanded)} ref={this.addMenuToggle}
-                    onChange={action((e: any) => this.props.Document.linearViewIsExpanded = this.addMenuToggle.current!.checked)} />
+                    onChange={action(() => this.props.Document.linearViewIsExpanded = this.addMenuToggle.current!.checked)} />
 
                 <div className="collectionLinearView-content" style={{ height: this.dimension(), flexDirection: flexDir }}>
                     {this.childLayoutPairs.map((pair, ind) => {
-- 
cgit v1.2.3-70-g09d2


From 5639cf97dbeff337e9661c874da4e46b9ed1a0b4 Mon Sep 17 00:00:00 2001
From: usodhi <61431818+usodhi@users.noreply.github.com>
Date: Thu, 17 Sep 2020 16:04:51 +0530
Subject: context menu scroll

---
 src/client/views/ContextMenu.scss | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/client')

diff --git a/src/client/views/ContextMenu.scss b/src/client/views/ContextMenu.scss
index 7467bc043..59848c3e5 100644
--- a/src/client/views/ContextMenu.scss
+++ b/src/client/views/ContextMenu.scss
@@ -11,6 +11,8 @@
     padding-bottom: 10px;
     border-radius: 15px;
     border: solid #BBBBBBBB 1px;
+    max-height: 550;
+    overflow-y: scroll;
 }
 
 // .contextMenu-item:first-child {
-- 
cgit v1.2.3-70-g09d2


From 93670ebde5de9c602aa45d0e06f377e8d3f89ce8 Mon Sep 17 00:00:00 2001
From: usodhi <61431818+usodhi@users.noreply.github.com>
Date: Mon, 21 Sep 2020 21:21:03 +0530
Subject: minor changes

---
 src/client/views/ContextMenu.scss     | 2 --
 src/client/views/nodes/FilterBox.scss | 1 +
 src/fields/util.ts                    | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/client')

diff --git a/src/client/views/ContextMenu.scss b/src/client/views/ContextMenu.scss
index 59848c3e5..7467bc043 100644
--- a/src/client/views/ContextMenu.scss
+++ b/src/client/views/ContextMenu.scss
@@ -11,8 +11,6 @@
     padding-bottom: 10px;
     border-radius: 15px;
     border: solid #BBBBBBBB 1px;
-    max-height: 550;
-    overflow-y: scroll;
 }
 
 // .contextMenu-item:first-child {
diff --git a/src/client/views/nodes/FilterBox.scss b/src/client/views/nodes/FilterBox.scss
index b39793f01..d32cc0d2b 100644
--- a/src/client/views/nodes/FilterBox.scss
+++ b/src/client/views/nodes/FilterBox.scss
@@ -33,6 +33,7 @@
         .filterBox-addFacetButton {
             display: flex;
             margin: auto;
+            cursor: pointer;
 
             .filterBox-span {
                 margin-right: 15px;
diff --git a/src/fields/util.ts b/src/fields/util.ts
index 9e5890aa8..31d5cc5f2 100644
--- a/src/fields/util.ts
+++ b/src/fields/util.ts
@@ -165,11 +165,10 @@ export function GetEffectiveAcl(target: any, in_prop?: string | symbol | number,
     // if the current user is the author of the document / the current user is a member of the admin group
     const userChecked = user || Doc.CurrentUserEmail;
     if (userChecked === (target.__fields?.author || target.author)) return AclAdmin;
+    if (currentUserGroups.includes("Admin")) return AclAdmin;
 
     if (target[AclSym] && Object.keys(target[AclSym]).length) {
 
-        if (currentUserGroups.includes("Admin")) return AclAdmin;
-
         // if the acl is being overriden or the property being modified is one of the playground fields (which can be freely modified)
         if (_overrideAcl || (in_prop && DocServer.PlaygroundFields?.includes(in_prop.toString()))) return AclEdit;
 
-- 
cgit v1.2.3-70-g09d2


From 3c24520a4bd34c50569605ad199f82e544810d11 Mon Sep 17 00:00:00 2001
From: usodhi <61431818+usodhi@users.noreply.github.com>
Date: Tue, 22 Sep 2020 18:07:25 +0530
Subject: changed default sharing permission in sharing menu to readonly

---
 src/client/util/SharingManager.tsx | 2 +-
 src/fields/util.ts                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/client')

diff --git a/src/client/util/SharingManager.tsx b/src/client/util/SharingManager.tsx
index d3500970d..713a27581 100644
--- a/src/client/util/SharingManager.tsx
+++ b/src/client/util/SharingManager.tsx
@@ -88,7 +88,7 @@ export class SharingManager extends React.Component<{}> {
             this.targetDoc = target_doc || target?.props.Document;
             DictationOverlay.Instance.hasActiveModal = true;
             this.isOpen = this.targetDoc !== undefined;
-            this.permissions = SharingPermissions.Edit;
+            this.permissions = SharingPermissions.View;
         });
     }
 
diff --git a/src/fields/util.ts b/src/fields/util.ts
index a3849661d..fe3eea69d 100644
--- a/src/fields/util.ts
+++ b/src/fields/util.ts
@@ -234,7 +234,7 @@ export function distributeAcls(key: string, acl: SharingPermissions, target: Doc
 
         // maps over the aliases of the document
         const links = DocListCast(dataDoc.links);
-        links.forEach(alias => distributeAcls(key, acl, alias, inheritingFromCollection, visited));
+        links.forEach(link => distributeAcls(key, acl, link, inheritingFromCollection, visited));
 
         // maps over the children of the document
         DocListCast(dataDoc[Doc.LayoutFieldKey(dataDoc)]).map(d => {
-- 
cgit v1.2.3-70-g09d2