diff --git a/README.md b/README.md index a76018c3..bfc028ea 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Kuwinda +# MissionKontrol ## Quickstart @@ -63,15 +63,6 @@ make bash bundle exec rails db:reset ``` -### Working with the dummy client database - -If the dummy client database has been emptied for whatever reason, you can run the seeds to fill it again with: - -```sh -make bash -bundle exec rake dummy_client_database:seeds -``` - ### Working with Docker #### Starting Docker @@ -143,29 +134,3 @@ NGINX Web Server configuration: * `WEB_SERVER_PORT` - allows to override the default HTTP port - `80/tcp`; * `WEB_SERVER_HTTPS_PORT` - allows to override the default HTTPS port - `443/tcp`; * `WEB_SERVER_STATIC_FILES` - enables serving static files by web server - should be used in combination with `RAILS_ENV=production` and `RAILS_SERVE_STATIC_FILES=true`. - -### Twilio configuration - -In order to use twilio there are four pieces of information required. They are -* Account SID -* Application SID -* Auth token -* Caller ID - -They can all be found in your twilio dashboard. Here is how to retrieve them. - -#### Account SID and Auth token - -Dashboard > Settings > Under API credentials you can find your account SID and auth token - -#### Application SID - -Dashboard > Programmable voice > TwiML > TwiML Apps > Create new app or choose existing app > Application SID can be found under properties - -#### Caller ID - -Dashboard > Programmable voice > Numbers > Mange numbers > select existing number or buy new number - -## Permissions - -subject_id = database_id diff --git a/app/assets/javascripts/page_specific/tables.js b/app/assets/javascripts/page_specific/tables.js index a9e7272e..5b07740c 100644 --- a/app/assets/javascripts/page_specific/tables.js +++ b/app/assets/javascripts/page_specific/tables.js @@ -340,13 +340,14 @@ function activityItem (data) { ""; } -function submitActivityForm (data) { +function submitActivityForm (data, databaseId) { let formData = { feedable_type: data.outcome.task_queue_item_table, feedable_id: parseInt(data.outcome.task_queue_item_primary_key), kind: "outcome", user_id: data.user_id, - content: data.outcome_content + content: data.outcome_content, + database_id: databaseId }; $.ajax({ @@ -382,6 +383,7 @@ function applyOutcomeRule () { let primaryKey = location.pathname.substr(1).split("/")[2].split("?")[0]; let outcome = $(this).data("outcome"); let taskQueueId = $(this).data("task-queue-id"); + let databaseId = location.search.split("database_id=")[1].split("&")[0]; let url = "/task_queues/" + taskQueueId + "/outcome"; let data = { @@ -401,7 +403,7 @@ function applyOutcomeRule () { window.toastr.error("Something went wrong, please try again."); }, success (data) { - submitActivityForm(data); + submitActivityForm(data, databaseId); $(".task-queue--outcome-button-success").addClass("hide"); $(".task-queue--outcome-button-failure").addClass("hide"); window.toastr.success("Task queue outcome updated."); diff --git a/bin/configure-host/README.md b/bin/configure-host/README.md index 397b582f..072232f0 100755 --- a/bin/configure-host/README.md +++ b/bin/configure-host/README.md @@ -1,6 +1,6 @@ # Configure Host -The Bash script that automate and simplify Kuwinda server configuration. +The Bash script that automates and simplifies MissionKontrol server configuration. ## Script Options