Merge pull request #9 from geirman/pr/8-migrator-fails

refactor migrator script for permissions

Author: neokoenig

migrator/migrations/20180519105946_Adds_Default_Permissions.cfc

@@ -27,100 +27,79 @@ component extends="wheels.migrator.Migration" hint="Adds Default Permissions" {
 			*/
 
 			try {
-			c=1;
-			 addRecord(table='permissions', name='admin', description='Global Administrative Access');
-			 addRecord(table='rolepermissions', roleid=1, permissionid=c);
-				c++;
-				addRecord(table='permissions', name='admin.auditlogs', description='Allow Global Administrative Access to Logs');
-					c++;
-					addRecord(table='permissions', name='admin.auditlogs.index', description='View Logs');
-					addRecord(table='rolepermissions', roleid=2, permissionid=c);
-					c++;
-					addRecord(table='permissions', name='admin.auditlogs.show', description='Show Log Extended Data');
-				c++;
-				addRecord(table='permissions', name='admin.permissions', description='Allow Global Administrative Access to Permissions');
-					c++;
-					addRecord(table='permissions', name='admin.permissions.index', description='List Permissions');
-					c++;
-					addRecord(table='permissions', name='admin.permissions.edit', description='Edit Permission');
-					c++;
-					addRecord(table='permissions', name='admin.permissions.update', description='Update Permission');
-				c++;
-				addRecord(table='permissions', name='admin.settings', description='Allow Global Administrative Access to Settings');
-					c++;
-					addRecord(table='permissions', name='admin.settings.index', description='List Settings');
-					c++;
-					addRecord(table='permissions', name='admin.settings.edit', description='Edit Setting');
-					c++;
-					addRecord(table='permissions', name='admin.settings.update', description='Update Setting');
-				c++;
-				addRecord(table='permissions', name='admin.users', description='Allow Global Administrative Access to Users');
-					c++;
-					addRecord(table='permissions', name='admin.users.index', description='List Users');
-					addRecord(table='rolepermissions', roleid=2, permissionid=c);
-					c++;
-					addRecord(table='permissions', name='admin.users.new', description='New User');
-					addRecord(table='rolepermissions', roleid=2, permissionid=c);
-					c++;
-					addRecord(table='permissions', name='admin.users.create', description='Create User');
-					addRecord(table='rolepermissions', roleid=2, permissionid=c);
-					c++;
-					addRecord(table='permissions', name='admin.users.edit', description='Edit User');
-					addRecord(table='rolepermissions', roleid=2, permissionid=c);
-					c++;
-					addRecord(table='permissions', name='admin.users.update', description='Update User');
-					addRecord(table='rolepermissions', roleid=2, permissionid=c);
-					c++;
-					addRecord(table='permissions', name='admin.users.delete', description='Delete User');
-					addRecord(table='rolepermissions', roleid=2, permissionid=c);
-					c++;
-					addRecord(table='permissions', name='admin.users.reset', description='Reset Users Password');
-					addRecord(table='rolepermissions', roleid=2, permissionid=c);
-					c++;
-					addRecord(table='permissions', name='admin.users.recover', description='Recover User');
-					addRecord(table='rolepermissions', roleid=2, permissionid=c);
-					c++;
-					addRecord(table='permissions', name='admin.users.show', description='View User');
-					addRecord(table='rolepermissions', roleid=2, permissionid=c);
-					c++;
-					addRecord(table='permissions', name='admin.users.assume', description='Assume Users (Grant only to Admins)');
-					c++;
-					addRecord(table='permissions', name='admin.users.destroy', description='Destroy Users (Grant only to Admins)');
-				c++;
-				addRecord(table='permissions', name='admin.roles', description='Allow Global Administrative Access to Roles');
-					c++;
-					addRecord(table='permissions', name='admin.roles.index', description='List Roles');
-					c++;
-					addRecord(table='permissions', name='admin.roles.new', description='New Role');
-					c++;
-					addRecord(table='permissions', name='admin.roles.create', description='Create Role');
-					c++;
-					addRecord(table='permissions', name='admin.roles.edit', description='Edit Role');
-					c++;
-					addRecord(table='permissions', name='admin.roles.update', description='Update Role');
-					c++;
-					addRecord(table='permissions', name='admin.roles.delete', description='Delete Role');
-				c++;
-			addRecord(table='permissions', name='accounts', description='Allow Global Access to Own Profile');
-			addRecord(table='rolepermissions', roleid=1, permissionid=c);
-			addRecord(table='rolepermissions', roleid=2, permissionid=c);
-			addRecord(table='rolepermissions', roleid=3, permissionid=c);
-				c++;
-				addRecord(table='permissions', name='accounts.show', description='View My Account');
-				c++;
-				addRecord(table='permissions', name='accounts.edit', description='Edit Own Account');
-				c++;
-				addRecord(table='permissions', name='accounts.update', description='Update Own Account');
-				c++;
+				c=0;
+				addRecord(table='permissions', id=++c, name='admin', description='Global Administrative Access');
+				addRecord(table='rolepermissions', roleid=1, permissionid=c)
+
+				addRecord(table='permissions', id=++c, name='admin.auditlogs', description='Allow Global Administrative Access to Logs');
+				addRecord(table='permissions', id=++c, name='admin.auditlogs.index', description='View Logs');
+				addRecord(table='rolepermissions', roleid=2, permissionid=c);
+
+				addRecord(table='permissions', id=++c, name='admin.auditlogs.show', description='Show Log Extended Data')
+				addRecord(table='permissions', id=++c, name='admin.permissions', description='Allow Global Administrative Access to Permissions');
+				addRecord(table='permissions', id=++c, name='admin.permissions.index', description='List Permissions');
+				addRecord(table='permissions', id=++c, name='admin.permissions.edit', description='Edit Permission');
+				addRecord(table='permissions', id=++c, name='admin.permissions.update', description='Update Permission')
+				addRecord(table='permissions', id=++c, name='admin.settings', description='Allow Global Administrative Access to Settings');
+				addRecord(table='permissions', id=++c, name='admin.settings.index', description='List Settings');
+				addRecord(table='permissions', id=++c, name='admin.settings.edit', description='Edit Setting');
+				addRecord(table='permissions', id=++c, name='admin.settings.update', description='Update Setting')
+				addRecord(table='permissions', id=++c, name='admin.users', description='Allow Global Administrative Access to Users');
+
+				addRecord(table='permissions', id=++c, name='admin.users.index', description='List Users');
+				addRecord(table='rolepermissions', roleid=2, permissionid=c);
+
+				addRecord(table='permissions', id=++c, name='admin.users.new', description='New User');
+				addRecord(table='rolepermissions', roleid=2, permissionid=c);
+
+				addRecord(table='permissions', id=++c, name='admin.users.create', description='Create User');
+				addRecord(table='rolepermissions', roleid=2, permissionid=c);
+
+				addRecord(table='permissions', id=++c, name='admin.users.edit', description='Edit User');
+				addRecord(table='rolepermissions', roleid=2, permissionid=c);
+
+				addRecord(table='permissions', id=++c, name='admin.users.update', description='Update User');
+				addRecord(table='rolepermissions', roleid=2, permissionid=c);
+
+				addRecord(table='permissions', id=++c, name='admin.users.delete', description='Delete User');
+				addRecord(table='rolepermissions', roleid=2, permissionid=c);
+
+				addRecord(table='permissions', id=++c, name='admin.users.reset', description='Reset Users Password');
+				addRecord(table='rolepermissions', roleid=2, permissionid=c);
+
+				addRecord(table='permissions', id=++c, name='admin.users.recover', description='Recover User');
+				addRecord(table='rolepermissions', roleid=2, permissionid=c);
+
+				addRecord(table='permissions', id=++c, name='admin.users.show', description='View User');
+				addRecord(table='rolepermissions', roleid=2, permissionid=c);
+
+				addRecord(table='permissions', id=++c, name='admin.users.assume', description='Assume Users (Grant only to Admins)');
+				addRecord(table='permissions', id=++c, name='admin.users.destroy', description='Destroy Users (Grant only to Admins)');
+				addRecord(table='permissions', id=++c, name='admin.roles', description='Allow Global Administrative Access to Roles');
+				addRecord(table='permissions', id=++c, name='admin.roles.index', description='List Roles');
+				addRecord(table='permissions', id=++c, name='admin.roles.new', description='New Role');
+				addRecord(table='permissions', id=++c, name='admin.roles.create', description='Create Role');
+				addRecord(table='permissions', id=++c, name='admin.roles.edit', description='Edit Role');
+				addRecord(table='permissions', id=++c, name='admin.roles.update', description='Update Role');
+				addRecord(table='permissions', id=++c, name='admin.roles.delete', description='Delete Role');
+
+				addRecord(table='permissions', id=++c, name='accounts', description='Allow Global Access to Own Profile');
+				addRecord(table='rolepermissions', roleid=1, permissionid=c);
+				addRecord(table='rolepermissions', roleid=2, permissionid=c);
+				addRecord(table='rolepermissions', roleid=3, permissionid=c);
+
+				addRecord(table='permissions', id=++c, name='accounts.show', description='View My Account');
+				addRecord(table='permissions', id=++c, name='accounts.edit', description='Edit Own Account');
+				addRecord(table='permissions', id=++c, name='accounts.update', description='Update Own Account');
+
+				/*
+				Named Permissions : arbitary permissions
+				*/
+				addRecord(table='permissions', id=++c, name='canViewAdminNotes', type="named", description='Allow user to view admin notes');
+
+				addRecord(table='permissions', id=++c, name='canViewLogData', type="named", description='Allow user to view extended log data');
+				addRecord(table='rolepermissions', roleid=1, permissionid=c);
 
-			/*
-			Named Permissions : arbitary permissions
-			*/
-			addRecord(table='permissions', name='canViewAdminNotes', type="named", description='Allow user to view admin notes');
-			c++;
-			addRecord(table='permissions', name='canViewLogData', type="named", description='Allow user to view extended log data');
-			addRecord(table='rolepermissions', roleid=1, permissionid=c);
-			c++;
 			} catch (any e) {
 				local.exception = e;
 			}