wassname/flask-security
1
0
Fork 0
mirror of https://github.com/wassname/flask-security.git synced 2026-08-04 12:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix up activate/deactivate user commands

Browse Source
This commit is contained in:
Matt Wright
2012-03-09 17:13:03 -05:00
parent e239216d92
commit 7376dd353d
6 changed files with 84 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flask_security/datastore/sqlalchemy.py
+2 -18
View File
@@ -49,9 +49,9 @@ class SQLAlchemyUserDatastore(UserDatastore):
return User, Role
def _save_model(self, model, commit=True):
def _save_model(self, model):
self.db.session.add(model)
if commit: self.db.session.commit()
self.db.session.commit()
return model
def _do_with_id(self, id):
@@ -63,20 +63,4 @@ class SQLAlchemyUserDatastore(UserDatastore):
def _do_find_role(self, role):
return security.Role.query.filter_by(name=role).first()
def create_role(self, commit=True, **kwargs):
role = security.Role(**self._prepare_create_role_args(kwargs))
return self._save_model(role, commit)
def create_user(self, commit=True, **kwargs):
user = security.User(**self._prepare_create_user_args(kwargs))
return self._save_model(user, commit)
def add_role_to_user(self, user, role, commit=True):
user = self._do_add_role(user, role)
return self._save_model(user, commit)
def remove_role_from_user(self, user, role, commit=True):
user = self._do_remove_role(user, role)
return self._save_model(user, commit)