Skip to content

Commit bf591d6

Browse files
committed
Deprecate add() in favor of saveRelations()
1 parent 6634a23 commit bf591d6

File tree

3 files changed

+5
-36
lines changed

3 files changed

+5
-36
lines changed

app/code/core/Mage/Admin/Model/Resource/User.php

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -306,45 +306,13 @@ public function getRoles(Mage_Core_Model_Abstract $user)
306306
/**
307307
* Save user roles
308308
*
309+
* @deprecated Use {@see _saveRelations} instead.
309310
* @param Mage_Core_Model_Abstract|Mage_Admin_Model_User $user
310311
* @return $this
311312
*/
312313
public function add(Mage_Core_Model_Abstract $user)
313314
{
314-
$dbh = $this->_getWriteAdapter();
315-
$aRoles = $this->hasAssigned2Role($user);
316-
if (count($aRoles)) {
317-
foreach ($aRoles as $idx => $data) {
318-
$dbh->delete(
319-
$this->getTable('admin/role'),
320-
['role_id = ?' => $data['role_id']]
321-
);
322-
}
323-
}
324-
325-
if ($user->getId() > 0) {
326-
$role = Mage::getModel('admin/role')->load($user->getRoleId());
327-
} else {
328-
$role = new Varien_Object(['tree_level' => 0]);
329-
}
330-
331-
$data = new Varien_Object([
332-
'parent_id' => $user->getRoleId(),
333-
'tree_level' => $role->getTreeLevel() + 1,
334-
'sort_order' => 0,
335-
'role_type' => Mage_Admin_Model_Acl::ROLE_TYPE_USER,
336-
'user_id' => $user->getUserId(),
337-
'role_name' => $user->getFirstname()
338-
]);
339-
340-
$insertData = $this->_prepareDataForTable($data, $this->getTable('admin/role'));
341-
$dbh->insert($this->getTable('admin/role'), $insertData);
342-
343-
if ($user->getId() > 0) {
344-
// reload acl on next user http request
345-
$this->saveReloadAclFlag($user, 1);
346-
}
347-
315+
$this->_saveRelations($user);
348316
return $this;
349317
}
350318

app/code/core/Mage/Admin/Model/User.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,11 +275,12 @@ public function roleUserExists()
275275
/**
276276
* Assign user to role
277277
*
278+
* @deprecated Use {@see saveRelations} instead.
278279
* @return $this
279280
*/
280281
public function add()
281282
{
282-
$this->_getResource()->add($this);
283+
$this->saveRelations();
283284
return $this;
284285
}
285286

app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ protected function _addUserToRole($userId, $roleId)
302302
if ($user->roleUserExists() === true) {
303303
return false;
304304
} else {
305-
$user->add();
305+
$user->saveRelations();
306306
return true;
307307
}
308308
}

0 commit comments

Comments
 (0)