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

Feature/admin user role crud #359

Merged
28 commits merged into from Jan 27, 2016
Merged

Feature/admin user role crud #359

28 commits merged into from Jan 27, 2016

Conversation

zakhenry
Copy link
Collaborator

No description provided.

… role crud for users, fixed implementation for role permission relation to allow proper nesting of permissions, added test
…arent role that is being called, updated role crud page to display the role that grants the permissions correctly, and the api methods it applies to
@zakhenry zakhenry self-assigned this Jan 14, 2016
zakhenry and others added 22 commits January 15, 2016 11:20
…er-role-crud

* 'master' of github.com:spira/spira: (55 commits)
  Applied fixes from StyleCI
  Fixed registration of filesystem config, added permissions check for utility controller method for system info, added tests
  Refactoring entity listing search function.
  Updating entity listing search to not use search when no search params have been entered.
  Updating composer lock file to get latest fix in api-core.
  Fixing query interface for listing search.
  Adding query interface for listing search.
  Updating listing search to always send a text search term.
  Updating article listing's tag md-chip's autocomplete so that it clears search text when a tag has been selected. Updating listing search to only add search parameters in if required.
  Reverting hotfix changes (accidentally committed to master).
  Updating article listing's tag md-chip's autocomplete so that it clears search text when a tag has been selected. Updating listing search to only add search parameters in if required.
  Removing unneeded ng-click on navigation items (fires state navigation event twice when coupled with ui-sref).
  Applied fixes from StyleCI
  Switched to using packagist for api-core source
  Mark test skipped for mapping issue with sort_order field. spira/core update
  UrlGenerator bind to 'url'
  fix redirect() call
  composer update
  Altered user service spec to not rely on timing to assert response ok
  Moved caching config to common
  ...
…to feature/admin-user-role-crud

* origin/feature/admin-user-role-crud:
  style fix
…to feature/admin-user-role-crud

* origin/feature/admin-user-role-crud:
  Applied fixes from StyleCI
…er-role-crud

* 'master' of github.com:spira/spira:
  Implementing entity 'cancel' functionality. Will return user to previous state (or dashboard if no previous state is available).
  Applying style patch.
  Updating user search mappings. Updating article listing to use md-contact-chips for author search.

# Conflicts:
#	app/src/app/admin/articles/article/article.tpl.html
… matched string so it doesn't care about the html5 hash mode
…functionality, added extended save method for admin user profile editor, added tests.
@zakhenry zakhenry assigned ghost and unassigned zakhenry Jan 25, 2016
describe('User Roles admin', () => {


it('should do something', () => {
Copy link

Choose a reason for hiding this comment

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

Is this meant to be written?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yea probably! will do.

ghost pushed a commit that referenced this pull request Jan 27, 2016
@ghost ghost merged commit 803e27e into master Jan 27, 2016
@ghost ghost deleted the feature/admin-user-role-crud branch January 27, 2016 01:14
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants