Skip to content

Butterflyknife Updates#41

Merged
alexweissman merged 9 commits intouserfrosting:butterflyknifefrom
lilfade:butterflyknife
May 29, 2014
Merged

Butterflyknife Updates#41
alexweissman merged 9 commits intouserfrosting:butterflyknifefrom
lilfade:butterflyknife

Conversation

@lilfade
Copy link
Contributor

@lilfade lilfade commented May 29, 2014

Updates to users.php, site_settings.php, other api files as well, fixed a few errors missing variables/globals and a php short tag found in db_functions.php. Transferred some variables to the new validator class as well in the api pages. Permissions on user update not working as of yet.

lilfade added 7 commits May 28, 2014 23:38
… removed permission/groups from loading there moved to groups.php (not working currently).
…lity to enable/disable user from the admin panel.

Switched more vars to use the validator class.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

random extra div tag

Copy link
Contributor Author

Choose a reason for hiding this comment

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

changed this to make it work not sure how this should work though any input?

Copy link
Member

Choose a reason for hiding this comment

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

For now, we can just set the permissions for that action to always() for user 1. We also need to implement action permits for groups, so we don't have to add a new set of permits for every new user. I was thinking a separate table, and then the checkActionPermissions function could check both a user and a user's groups' permissions. What do you think?

alexweissman added a commit that referenced this pull request May 29, 2014
@alexweissman alexweissman merged commit 08e7be2 into userfrosting:butterflyknife May 29, 2014
@alexweissman
Copy link
Member

Cool, this looks good. I'll try to take a crack at it today if I have time :-D

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.

2 participants