-
Notifications
You must be signed in to change notification settings - Fork 31
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add actions to pods #126
Merged
rowanseymour
merged 114 commits into
rapidpro:master
from
praekeltfoundation:EPIC-OPENHELPD-23
Aug 15, 2016
Merged
Add actions to pods #126
Changes from 110 commits
Commits
Show all changes
114 commits
Select commit
Hold shift + click to select a range
86c7186
Add action support to PodApi angular service
justinvdm 40dbd13
Add commas for separating object properties in PodApi service and its…
justinvdm b901c3f
Change base pod directive to draw actions
justinvdm 526afad
Fix padding for items in pod body
justinvdm f0a00d4
Fix multi-line attribute spacing for pod template
justinvdm 054db41
Don't call action trigger function with case ids in pod directive
justinvdm a5e7be4
Update PodApi service sending of actions request to match api change
justinvdm c715570
Refactor base pod controller's updating of pod data into its own method
justinvdm ddc1210
Update base pod directive's action tests to instantiate directive as …
justinvdm c59d79f
Merge branch 'EPIC-OPENHELPD-21' into EPIC-OPENHELPD-23
justinvdm aafcd49
Update base pod controller to trigger actions
justinvdm 713ec63
Fix action request body in PodApi service
justinvdm a4fabac
Fix pod action anchor tags to not make the page jump
justinvdm 459cac8
Update case timeline after pod action trigger
justinvdm 38ceb6d
Change case field to case_id in error message
fd88660
Add docstring for pod read_data format
eda494a
Add docstring to pod perform_action to describe format
47d7a4a
Create case action note if action was successful
21903d1
Update tests for pod action changes
477bcbc
Fix expected error message in test
e73cba4
Use [[s for angular templates
justinvdm 37c08a5
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-49-update-podapi-…
justinvdm 00dcaa8
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-52-update-base-po…
justinvdm f5eb1c1
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-53-update-case-ac…
justinvdm 3451969
Add notifications directive
justinvdm 779c6a7
Change pod controller to emit event on pod action failure
justinvdm 542b5a7
Change CaseController to add a notification on pod action failure
justinvdm 085b469
Parse fetched pod data in pod controller to add busy flags to action …
justinvdm d2a7816
Change pod controller to set actions to busy when triggered
justinvdm 3ed98b6
Merge branch 'feature/issue-48-draw-actions-from-pod-data' into featu…
justinvdm 8a8d797
Change pod controller to set actions to not be busy when triggers com…
justinvdm d38f15d
Change pod controller to support using custom busy text for actions
justinvdm bb06575
Minor cleanup for pod controller
justinvdm e28738e
Change pod directive to draw busy actions differently
justinvdm 9fad273
More consistent callback names in pod controller
justinvdm 2581f7f
Merge pull request #55 from praekelt/feature-issue-51-backend-changes…
3990069
Refactor PodApi to avoid needing to repeat logic for handling responses
justinvdm 7af3be6
Reject PodApi errors as PodApiErrors
justinvdm 61cfa15
Add trap utility
justinvdm 1b82c41
Emit an event if pod api calls fail in pod controller
justinvdm 7ff8f88
Merge branch 'feature/issue-56-notify-on-pod-action-failure' into fea…
justinvdm 787fa0f
Emit timelineChanged events from pod controller on pod action success…
justinvdm 093620c
Merge branch 'develop' into EPIC-OPENHELPD-23
justinvdm bcb4cdb
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-53-update-case-ac…
justinvdm 26f4247
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-57-provide-visual…
justinvdm 1179973
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-48-draw-actions-f…
justinvdm 477bd0d
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-56-notify-on-pod-…
justinvdm 098e1d1
Change case notifications approach to keep notification content insid…
justinvdm 94f891e
Remove accidental change to pod action trigger success callback in po…
justinvdm 01bfa9d
Merge branch 'feature/issue-56-notify-on-pod-action-failure' into fea…
justinvdm 26369ba
Emit notification for trigger api failures in pod controller
justinvdm 7955092
Add notification for pod action api failures
justinvdm 4be1e28
Merge branch 'develop' into EPIC-OPENHELPD-23
justinvdm 33a92cb
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-56-notify-on-pod-…
justinvdm 849af1e
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-53-update-case-ac…
justinvdm 798b8f9
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-48-draw-actions-f…
justinvdm 01bff59
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-57-provide-visual…
justinvdm 2284cbb
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-59-handle-pod-err…
justinvdm 804ef03
Change pod controller and directive to show when pod is loading
justinvdm 1507722
Change pod controller and directive to show when loading pod fails
justinvdm 2fc6862
Display a notification if loading pods fails
justinvdm 0acacff
Only set actions to not be busy once success or failure callback has …
justinvdm fe267dd
Merge branch 'feature/issue-57-provide-visual-feedback-when-pod-actio…
justinvdm 4e54077
Fix scope soup in cp-case-notifications directive
justinvdm 82ecd13
Merge branch 'feature/issue-56-notify-on-pod-action-failure' into fea…
justinvdm 4afda00
Fix failing test after merging in updates to #56
justinvdm a6ff38b
Merge branch 'feature/issue-59-handle-pod-error-responses-in-ui' into…
justinvdm 658938d
More consistent naming convention for pod status scope property
justinvdm b94a1cf
Merge branch 'develop' into EPIC-OPENHELPD-23
justinvdm 072e2c8
Merge branch 'develop' into feature/issue-53-update-case-actions-afte…
justinvdm 162188d
Merge branch 'develop' into feature/issue-48-draw-actions-from-pod-data
justinvdm 6104f65
Merge branch 'develop' into feature/issue-56-notify-on-pod-action-fai…
justinvdm 9056cdc
Merge branch 'develop' into feature/issue-57-provide-visual-feedback-…
justinvdm 9ad8bd1
Merge branch 'develop' into feature/issue-59-handle-pod-error-respons…
justinvdm 30a20d0
Merge branch 'develop' into feature/issue-60-show-when-pods-load-or-f…
justinvdm bf6ea66
Merge branch 'feature/issue-48-draw-actions-from-pod-data' into EPIC-…
justinvdm 1f8ff75
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-57-provide-visual…
justinvdm 65e3bfa
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-53-update-case-ac…
justinvdm a4ebc33
Add pod action confirm modal
justinvdm bbd9d49
Change PodController to support showing confirmation modal for actions
justinvdm 341e95c
Clean up PodController tests
justinvdm d50c77f
Merge branch 'develop' into EPIC-OPENHELPD-23
justinvdm b684ae9
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-56-notify-on-pod-…
justinvdm 7436b23
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-57-provide-visual…
justinvdm 8b23672
Merge branch 'feature/issue-56-notify-on-pod-action-failure' into fea…
justinvdm f9e1ecf
Merge branch 'feature/issue-57-provide-visual-feedback-when-pod-actio…
justinvdm ed26df5
Merge branch 'feature/issue-59-handle-pod-error-responses-in-ui' into…
justinvdm 764bc24
Merge branch 'feature/issue-60-show-when-pods-load-or-fail-to-load' i…
justinvdm f0064a5
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-57-provide-visual…
justinvdm b39cd36
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-59-handle-pod-err…
justinvdm 255bd0d
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-60-show-when-pods…
justinvdm f8b8405
Merge branch 'feature/issue-60-show-when-pods-load-or-fail-to-load' i…
justinvdm dd5aaaf
Merge branch 'develop' into feature/issue-58-pod-confirm-modal
justinvdm f689f48
Fix pod action confirm modal template to only include title in header
justinvdm ca19784
Fix timelineChanged event proxying and related false positive test (t…
justinvdm f3e51f1
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-58-pod-confirm-modal
justinvdm 7b7d1e2
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-62-change-pod-mod…
justinvdm c682b52
Add basic ModalService with confirm() method for generic confirm modals
justinvdm 9eb52e4
Add PodUIService.confirmAction() for drawing pod action confirm modals
justinvdm a7860da
Use PodUIService.confirmAction() in pod controller
justinvdm a3693f0
Move modal templates into subdirectory
justinvdm d4cb017
Rename notifications to alerts
justinvdm 2c828bb
Remove stray template url in pod controller
justinvdm 4a622be
Change alerts approach to display alerts that have their own markup u…
justinvdm a894215
Undisable pod actions after error
justinvdm 5e5f824
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-62-change-pod-mod…
justinvdm d48c4c3
Include user's name on case action when pod action is triggered
justinvdm e1d3209
Merge branch 'master' of https://github.com/rapidpro/casepro into EPI…
147e2b1
Merge branch 'feature/issue-66-include-users-name-on-pod-action-case-…
justinvdm 89b2cb3
Update pod docstrings
justinvdm b92c1ab
Fix bad search-and-replace for notification -> alert (thanks @rudigie…
justinvdm 52d6c3e
Move dummy templates to karma directory
justinvdm b7e7792
Restrict access for case views
justinvdm 8990707
Merge branch 'EPIC-OPENHELPD-23' into feature/issue-71-restrict-acces…
justinvdm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For security, filter by org too to make sure a user can never act on a case outside of their org
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually come to think of it, it should actually be checking
Case.access_level(user)
to make sure this user has correct access rights to this case.Obviously this applies to anywhere requests can access or modify cases.