Merge remote-tracking branch 'origin/development'

CHANGELOG.md

@@ -1,6 +1,19 @@
 # Changelog
 <!-- Use the tags Added, Changed, Deprecated, Removed, Fixed, Security, and
      Contributor to describe changes -->
+## [0.6.4]
+###### 2018-01-18
+
+### Changed
+* The accept/decline method returns status codes indicating if the action was
+  accepted or declined instead of true/false
+
+
+### Fixed
+* Fixed a bug where roles weren't being deleted from the database
+* Fixed a bug on the UI where correct permissions weren't being displayed for
+  roles
+
 ## [0.6.3]
 ###### 2018-01-18
 

apps/Utilities/actions.py

@@ -173,4 +173,5 @@ def send_full_message(message, users=None, roles=None):
 
 @action
 def accept_decline(action):
-    return action.lower() == 'accept'
+    r = action.lower() == 'accept'
+    return r, "Accepted" if r else "Declined"

apps/Utilities/api.yaml

@@ -550,8 +550,13 @@ actions:
       - name: action
         type: string
         required: true
+    default_return: Accepted
     returns:
-      Success:
+      Accepted:
+        schema:
+          type: boolean
+      Declined:
+        failure: true
         schema:
           type: boolean
 conditions:

apps/Utilities/conditions.py

@@ -59,5 +59,5 @@ def reverse_boolean(value):
 
 @condition
 def accept_decline(value):
-    return value.lower() == 'accept'
-
+    r = value.lower() == 'accept'
+    return r, "Accepted" if r else "Declined"

walkoff/client/main/main.component.ts

@@ -100,7 +100,7 @@ export class MainComponent {
 				// 		(this.messageModalRef.componentInstance.message as Message).read_by.push(update.username);
 				// 	}
 				// });
-				eventSource.addEventListener('respond', (message: any) => {
+				eventSource.addEventListener('responded', (message: any) => {
 					const update: MessageUpdate = JSON.parse(message.data);
 
 					const existingMessage = this.messageListings.find(m => m.id === update.id);

walkoff/client/settings/settings.roles.modal.component.ts

@@ -95,7 +95,7 @@ export class SettingsRoleModalComponent {
 
 	removeResource(resource: Resource): void {
 		this.workingRole.resources.splice(this.workingRole.resources.indexOf(resource), 1);
-		delete this.selectPermissionMapping[resource.resource_id];
+		// delete this.selectPermissionMapping[resource.resource_id];
 	}
 
 	permissionSelectChange(event: any, resource: Resource) {

walkoff/server/endpoints/roles.py

@@ -85,6 +85,7 @@ def delete_role(role_id):
     def __func(role):
         clear_resources_for_role(role.name)
         db.session.delete(role)
+        db.session.commit()
         return {}, SUCCESS
 
     return __func()