Skip to content
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.

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

added "root" attribute to user entity #1630

Merged
merged 5 commits into from
Oct 20, 2016
Merged

added "root" attribute to user entity #1630

merged 5 commits into from
Oct 20, 2016

Conversation

stopfstedt
Copy link
Member

refs #1623

@homu
Copy link
Contributor

homu commented Oct 13, 2016

☔ The latest upstream changes (presumably dc70e8b) made this pull request unmergeable. Please resolve the merge conflicts.

@stopfstedt stopfstedt changed the title added "isRoot" attribute to user entity added "root" attribute to user entity Oct 14, 2016
@@ -470,6 +470,7 @@ public function removeLearnerIlmSession(IlmSessionInterface $learnerIlmSession);
public function getLearnerIlmSessions();

/**
<<<<<<< 198377f486608690bd5286f036e4f848848c8c58
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👎

@jrjohnson
Copy link
Member

According to @stopfstedt this needs to have protection in the controller to prevent anyone from setting the root attr for users.

@stopfstedt
Copy link
Member Author

@jrjohnson please re-review, esp. the changes to the UserController endpoints. Thanks!

Copy link
Member

@jrjohnson jrjohnson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only comment is on the names of the set/unset root commands. That may only be the way I'm thinking about it though.
UserController looks good to me. Great tests.

/**
* @var string
*/
const COMMAND_NAME = 'ilios:maintenance:set-root-user';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

set-root-user implies to me that there is only one. should probably be called add-root-user.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

renamed.

/**
* @var string
*/
const COMMAND_NAME = 'ilios:maintenance:unset-root-user';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove-root-user would make more sense otherwise maybe it removes everyone?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

renamed.

@jrjohnson jrjohnson assigned stopfstedt and unassigned jrjohnson Oct 19, 2016
@stopfstedt stopfstedt assigned jrjohnson and unassigned stopfstedt Oct 20, 2016
@jrjohnson
Copy link
Member

@stopfstedt failing test here.

@stopfstedt
Copy link
Member Author

ugh, searched/replaced without thinking. fixed.

@jrjohnson jrjohnson merged commit f216f21 into ilios:master Oct 20, 2016
@stopfstedt stopfstedt deleted the 1623_root_user branch October 20, 2016 06:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants