Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Backend - Engine
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 36
    • Merge Requests 36
  • 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
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds Backend - EngineMinds Backend - Engine
  • Merge Requests
  • !350

Open
Opened 1 week ago by Brian Hatchet@brianhatchet:speech_balloon:
  • Report abuse
Report abuse

WIP: Epic/permissions 28

MR for insight into everything that has changed for permissions

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b "epic/permissions-28" "origin/epic/permissions-28"

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "origin/master"
git merge --no-ff "epic/permissions-28"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Request to merge epic/permissions-28 into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #88079560 passed for d72ab70c on epic/permissions-28
          Requires 3 more approvals from Devs, Deployers, and QA.
          Mark Harding
          Mark Harding
          Rami Albatal
          Rami Albatal
          Martin Santangelo
          Martin Santangelo
          Guy Thouret
          Guy Thouret
          Marcelo Rivera
          Marcelo Rivera
          This is a Work in Progress

          Deletes source branch

          You can merge this merge request manually using the
          • Discussion 21
          • Commits 18
          • Pipelines 13
          • Changes 65
          8/10 threads resolved
          • Loading...
          • Brian Hatchet :speech_balloon: @brianhatchet changed milestone to %Permission #review 1 week ago

            changed milestone to %Permission #review

          • Brian Hatchet :speech_balloon: @brianhatchet added Sprint::09/25 - Oldfashioned Owl Squad::Green scoped labels 1 week ago

            added Sprint::09/25 - Oldfashioned Owl Squad::Green scoped labels

          • Brian Hatchet :speech_balloon: @brianhatchet added 2 commits 1 week ago

            added 2 commits

            • 21171789 - Chore refactor permissions export
            • 1559425f - Merge branch 'chore-refactor-permissions-export' into 'epic/permissions-28'

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 1 week ago

            added 1 commit

            • 8c974984 - Merge

            Compare with previous version

          • Mark Harding @markeharding mentioned in epic &28 6 days ago

            mentioned in epic &28

          • Marcelo Rivera @eiennohi added 1 commit 6 days ago

            added 1 commit

            • 0c4046d6 - (fix): don't do strict checks on guids

            Compare with previous version

          • Marcelo Rivera @eiennohi added 2 commits 3 days ago

            added 2 commits

            • c9f0865f - (fix): assign $entities after checking user entity
            • d1b2d7a4 - (feat): more thorough spec tests

            Compare with previous version

          • Mark Harding @markeharding added MR::Requires Changes scoped label 2 days ago

            added MR::Requires Changes scoped label

          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 2 days ago
            Resolved by Brian Hatchet 9 hours ago
          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 2 days ago
            Last updated by Brian Hatchet 9 hours ago
            Api/Exportable.php
            100 105
            101 106 $exported = $item->export(...$this->exportArgs);
            102 107
            108 if ($item && Di::_()->get('Features\Manager')->has('permissions')) {
            109 if ($item instanceof FeedSyncEntity && $item->getEntity()) {
            110 $entity = $item->getEntity();
            111 } else {
            112 $entity = $item;
            113 }
            114
            115 /** @var Manager $permissionsManager */
            116 $permissionsManager = Di::_()->get('Permissions\Manager');
            117 $permissions = $permissionsManager->getList([
            • Mark Harding
              Mark Harding @markeharding · 2 days ago
              Owner

              Why are using a list function for a single entity?

            • Brian Hatchet
              Brian Hatchet :speech_balloon: @brianhatchet · 9 hours ago
              Developer

              Because it's not a single entity per se. You can calculate the permissions for entire permissions at the manager level. We're just using it at the entity level to calculate single ones.

            • Brian Hatchet
              Brian Hatchet :speech_balloon: @brianhatchet · 9 hours ago
              Developer

              I can name it whatever you'd like, just following our manager paradigm

            • Please register or sign in to reply
          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 2 days ago
            Resolved by Brian Hatchet 9 hours ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 2 days ago
            Resolved by Brian Hatchet 9 hours ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 2 days ago
            Resolved by Brian Hatchet 9 hours ago
          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 2 days ago
            Resolved by Brian Hatchet 9 hours ago
          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 2 days ago
            Resolved by Brian Hatchet 9 hours ago
          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 2 days ago
            Last updated by Brian Hatchet 8 hours ago
            Core/Permissions/Permissions.php
            119 150 return $export;
            120 151 }
            121 152
            153 /**
            154 * Export the exact permissions for a calculated entity only
            155 *
            156 * @return array serialized individual permission for an entity
            157 */
            158 public function exportPermission($guid): array
            • Mark Harding
              Mark Harding @markeharding · 2 days ago
              Owner

              I'm having trouble with this function name, its not clear how it is different from export() function.

            • Brian Hatchet
              Brian Hatchet :speech_balloon: @brianhatchet · 8 hours ago
              Developer

              I am amenable to a better name.

            • Please register or sign in to reply
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 2 days ago
            Resolved by Brian Hatchet 8 hours ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 2 days ago
            Resolved by Brian Hatchet 8 hours ago
          • Brian Hatchet :speech_balloon: @brianhatchet added 18 commits 9 hours ago

            added 18 commits

            • d1b2d7a4...142d395f - 17 commits from branch master
            • 29e98b44 - Merge remote-tracking branch 'origin/master' into epic/permissions-28

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 8 hours ago

            added 1 commit

            • 1b045c85 - CR fixes

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 8 hours ago

            added 1 commit

            • d72ab70c - Relinting ElggEntity so the change is readable

            Compare with previous version

          • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
          Please register or sign in to reply
          Assignee
          Brian Hatchet's avatar
          Brian Hatchet @brianhatchet
          Assign to
          Permission #review
          Milestone
          Permission #review
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          3
          Labels
          MR::Requires Changes Sprint::09/25 - Oldfashioned Owl Squad::Green
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          10
          10 participants
          user avatar
          Mark Harding
          user avatar
          Rami Albatal
          user avatar
          Martin Santangelo
          user avatar
          Guy Thouret
          user avatar
          Marcelo Rivera
          user avatar
          Emiliano Balbuena
          user avatar
          Ben Hayward
          Reference: minds/engine!350