From 07f26bdb6c51fe8392659ba13c30e3c658e0f2c0 Mon Sep 17 00:00:00 2001
From: vsmk98 <vsaimk@gmail.com>
Date: Fri, 29 Mar 2019 12:27:13 +0800
Subject: [PATCH] permissions: modified implementation contract for creating
 orgadmin role, added status to account access modified event

---
 controls/permission/AccountManager.sol            | 6 +++---
 controls/permission/PermissionsImplementation.sol | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/controls/permission/AccountManager.sol b/controls/permission/AccountManager.sol
index 44fa2f90c..c9f3b4862 100644
--- a/controls/permission/AccountManager.sol
+++ b/controls/permission/AccountManager.sol
@@ -22,7 +22,7 @@ contract AccountManager {
     mapping(bytes32 => bool) private orgAdminIndex;
 
     // account permission events
-    event AccountAccessModified(address _address, string _orgId, string _roleId, bool _orgAdmin);
+    event AccountAccessModified(address _address, string _orgId, string _roleId, bool _orgAdmin, uint _status);
     event AccountAccessRevoked(address _address, string _orgId, string _roleId, bool _orgAdmin);
 
     modifier onlyImpl
@@ -95,7 +95,7 @@ contract AccountManager {
         if (_oAdmin) {
             orgAdminIndex[keccak256(abi.encodePacked(_orgId))] = true;
         }
-        emit AccountAccessModified(_address, _orgId, _roleId, _oAdmin);
+        emit AccountAccessModified(_address, _orgId, _roleId, _oAdmin, _status);
     }
 
     function addNWAdminAccount(address _address, string calldata _orgId) external
@@ -132,7 +132,7 @@ contract AccountManager {
             (status == 1)) {
             uint aIndex = getAcctIndex(_address);
             acctAccessList[aIndex].status = 2;
-            emit AccountAccessModified(_address, acctAccessList[aIndex].orgId, acctAccessList[aIndex].role, acctAccessList[aIndex].orgAdmin);
+            emit AccountAccessModified(_address, acctAccessList[aIndex].orgId, acctAccessList[aIndex].role, acctAccessList[aIndex].orgAdmin, acctAccessList[aIndex].status);
         }
 
     }
diff --git a/controls/permission/PermissionsImplementation.sol b/controls/permission/PermissionsImplementation.sol
index 02b8b491a..ed4bae070 100644
--- a/controls/permission/PermissionsImplementation.sol
+++ b/controls/permission/PermissionsImplementation.sol
@@ -144,6 +144,7 @@ contract PermissionsImplementation {
         require(checkOrgStatus(_orgId, 1) == true, "Nothing to approve");
         if ((processVote(adminOrg, _caller, 1))) {
             org.approveOrg(_orgId);
+            roles.addRole(orgAdminRole, _orgId, fullAccess, true);
             nodes.approveNode(_enodeId, _orgId);
         }
     }