Skip to content
Next
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Minds Backend - Engine
Project
Project
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
229
Issues
229
List
Boards
Labels
Service Desk
Milestones
Merge Requests
35
Merge Requests
35
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Security & Compliance
Security & Compliance
Dependency List
Packages
Packages
List
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Minds
Minds Backend - Engine
Commits
1b045c85
Commit
1b045c85
authored
35 minutes ago
by
Brian Hatchet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CR fixes
parent
29e98b44
epic/permissions-28
1 merge request
!350
WIP: Epic/permissions 28
Pipeline
#88079097
passed with stages
in 10 minutes and 9 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
12 deletions
+8
-12
Core/Feeds/FeedSyncEntity.php
Core/Feeds/FeedSyncEntity.php
+8
-2
Core/Permissions/Permissions.php
Core/Permissions/Permissions.php
+0
-2
Core/Provisioner/Provisioners/cassandra-provision.cql
Core/Provisioner/Provisioners/cassandra-provision.cql
+0
-8
No files found.
Core/Feeds/FeedSyncEntity.php
View file @
1b045c85
...
...
@@ -50,7 +50,13 @@ class FeedSyncEntity implements JsonSerializable
/** @var Entity */
protected
$entity
;
public
function
setEntity
(
$entity
)
/**
* Setter for populating the child entity on feed sync items
* Some FeedSyncEntity managers populate the entity with the hydrated object
* Do not assume this is always called because you can easily
* Just have the header information stored in ES (without the entity)
*/
public
function
setEntity
(
$entity
)
:
FeedSyncEntity
{
$this
->
entity
=
$entity
;
$this
->
accessId
=
$entity
->
getAccessId
();
...
...
@@ -70,7 +76,7 @@ class FeedSyncEntity implements JsonSerializable
return
[
'guid'
=>
(
string
)
$this
->
guid
,
'owner_guid'
=>
(
string
)
$this
->
ownerGuid
,
'access_id'
=>
$this
->
accessId
,
'access_id'
=>
(
int
)
$this
->
accessId
,
'timestamp'
=>
$this
->
timestamp
,
'urn'
=>
$this
->
urn
,
'type'
=>
$this
->
type
,
...
...
This diff is collapsed.
Click to expand it.
Core/Permissions/Permissions.php
View file @
1b045c85
...
...
@@ -39,8 +39,6 @@ class Permissions implements \JsonSerializable
$this
->
entitiesBuilder
=
$entitiesBuilder
?:
Di
::
_
()
->
get
(
'EntitiesBuilder'
);
$this
->
roles
=
$roles
?:
new
Roles
();
$this
->
user
=
$user
;
$this
->
groups
=
[];
$this
->
channels
=
[];
$this
->
entities
=
[];
$this
->
roles
=
$roles
?:
new
Roles
();
$this
->
user
=
$user
;
...
...
This diff is collapsed.
Click to expand it.
Core/Provisioner/Provisioners/cassandra-provision.cql
View file @
1b045c85
...
...
@@ -1497,14 +1497,6 @@ CREATE TABLE minds.moderation_summons (
ALTER TABLE minds.views ADD owner_guid text;
CREATE TABLE minds.subscription_requests (
publisher_guid bigint,
subscriber_guid bigint,
timestamp timestamp,
declined boolean,
PRIMARY KEY (publisher_guid, subscriber_guid)
);
CREATE TABLE minds.pro (
user_guid bigint,
domain text,
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment