darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-05-27 09:29:22 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,383 Commits 57 Branches 59 Tags
cf34aff673cff22c9856fdeada7503e4e3f4c06d
Commit Graph

1589 Commits

Author SHA1 Message Date
minglis
9a60cf49a4 Merge pull request #899 from alphagov/handle-new-jobs-api 
Handle new jobs api
 2016-08-25 09:56:30 +01:00
Martyn Inglis
c61199d17d Rewrote some slighlt over complicated logic 2016-08-25 09:15:55 +01:00
Martyn Inglis
d56c14e147 Actually use the right exception class. 
Two HTTPError classes exist. Need to use the one in notifications_python_client.
 2016-08-24 12:12:19 +01:00
Martyn Inglis
d149a9691a Added tests for the 2 use cases: 
used templates

unused templates
 2016-08-24 12:09:38 +01:00
Martyn Inglis
0b95a30e2f Raise the exception if not a 404 2016-08-24 11:26:34 +01:00
Martyn Inglis
6e3759eb1f Merge branch 'master' into new-api-for-deleting-templates 
Conflicts:
	app/main/views/templates.py
 2016-08-24 11:05:19 +01:00
Martyn Inglis
5b2ae43d5d Wrote some tests around the stats conversions. 
Properly named the finished parameter.

Handled the root JSON key
 2016-08-24 10:35:04 +01:00
Martyn Inglis
b5de1dae5e Merge branch 'master' into handle-new-jobs-api 2016-08-23 16:59:28 +01:00
Martyn Inglis
4a551329c5 Parse the JOB API response converting new style response to old style object 
- allows migration of API
 2016-08-23 16:58:50 +01:00
Chris Hill-Scott
cd091af9e7 Merge pull request #894 from alphagov/fix-research-mode-toggle 
Fix admin app putting service into research mode
 2016-08-23 14:27:02 +01:00
Chris Hill-Scott
0f6a090470 Fix admin app putting service into research mode 
We changed the `update_service` method to only update indivdual
attributes of a service, and only allow it to update specified
attributes: 0cfe10639a

We neglected to specify `research_mode` as one of the allowed
attributes.

This broke the app’s ability to put a service in or out of research
mode.

This commit:
- makes sure the tests cover this eventuality
- fixes the bug by specifying `research_mode` as one of the allowed
  attributes
 2016-08-23 10:16:27 +01:00
Martyn Inglis
c44a6cb65d Merge branch 'master' into new-api-for-deleting-templates 2016-08-23 09:31:05 +01:00
Martyn Inglis
49b4387b25 Merge branch 'master' into handle-new-template-stats-endpoint 2016-08-23 09:30:38 +01:00
Martyn Inglis
4dec7a7939 Changed order of templates activity page from alphabetical to desc count. 2016-08-23 09:14:21 +01:00
Andras Ferencz-Szabo
25009f3ac9 Merge pull request #870 from alphagov/jenkins_deploy 
Create Docker build image, build project with Docker
 2016-08-22 17:57:28 +01:00
bandesz
26ff449b77 Create Docker build image, build project with Docker 2016-08-22 17:25:05 +01:00
Martyn Inglis
54e4311d1b Merged in the defensive code by mistake 2016-08-22 16:56:43 +01:00
Martyn Inglis
9fbd410474 Merge branch 'master' into use_new_template_stats_endpoint 
Conflicts:
	app/notify_client/template_statistics_api_client.py
 2016-08-22 16:47:42 +01:00
Martyn Inglis
c43fde0ac0 For the brief moment when we have incompatible API versions out, 
We won't call template stats by template id as the format has changed. So just ask the question "do you want to delete" without the context.
 2016-08-22 16:35:14 +01:00
minglis
8a04770c8e Merge pull request #878 from alphagov/handle_api_response 
Handle the API migration
 2016-08-22 16:30:37 +01:00
Martyn Inglis
9d25f326b0 Using new endpoint for template statistics 
- gets notifications by template id, returning the most recent to illustrate the last use of that template.
 2016-08-22 16:25:35 +01:00
Chris Hill-Scott
d893a67fc2 Another content change from Gwen 
_Missed this one because it was in a different email_

We don't use 'we'.

It's better to say 'An email has been sent to...'
 2016-08-22 15:47:25 +01:00
Chris Hill-Scott
1e254415d2 Text message not Sms 2016-08-22 13:30:03 +01:00
Martyn Inglis
63fa77fde7 Admin app now in line with new API response for template statistics 
- dropped the day level aggregate. Now grouped by template only,
 2016-08-22 13:14:35 +01:00
Martyn Inglis
4cab7ffb3c Merge branch 'master' into use_new_template_stats_endpoint 2016-08-22 12:55:11 +01:00
Martyn Inglis
5666719a92 Merge branch 'master' into more_wording_changes 
Conflicts:
	app/templates/views/verify-mobile.html
 2016-08-22 12:54:10 +01:00
Martyn Inglis
380a6526c4 Changed some more instances of "confirmation" code to "security" code 2016-08-22 12:52:05 +01:00
Martyn Inglis
f59e05fb1a Handle the API migration 
If it;s the new format API hide the results

- Temp fix until new Admin code ships. Should be live for 5 mins.
 2016-08-22 12:35:34 +01:00
Chris Hill-Scott
78de805b9a Remove and/or from request to go live page 
We don't use 'and/or' - you should just stick to 'and'.
 2016-08-22 11:46:18 +01:00
Chris Hill-Scott
8cca2ef235 Lose the 'now' in the 'check your email' title 2016-08-22 11:46:10 +01:00
Chris Hill-Scott
aa166856b4 Change 'verification code' to 'security code' 
Extensive testing on Verify has shown that this is understood better.
 2016-08-22 11:46:07 +01:00
Martyn Inglis
55c4443a05 Admin app uses the new API response formats. 2016-08-18 15:30:57 +01:00
Martyn Inglis
d78c98970d Removed this date. Wasn't integrated. Data was incorrect and didn't respect it. No API calls ensured it was true. 2016-08-18 15:30:32 +01:00
Leo Hemsted
fc14a800b5 remove print 2016-08-16 14:55:23 +01:00
Leo Hemsted
fde8d81868 send organisation back in correct variable 2016-08-15 11:15:49 +01:00
Leo Hemsted
3c0f06a36d set value of radio input to be org id 
also don't use nil, this isn't ruby
 2016-08-15 10:39:34 +01:00
Leo Hemsted
fb510d2522 only set organisation on GET and add allowed fields to service client 
we were overwriting it before validating the form for POST, so lost info
 2016-08-12 12:37:18 +01:00
Leo Hemsted
7c16614538 set current services's values on service branding form 2016-08-12 11:48:04 +01:00
Chris Hill-Scott
6b5e64479a Add a page to set organisation and branding option 
Platform admin only.

Adds radio buttons to choose one of:
- three hard-coded branding options
- organisations from a list provided by the API
 2016-08-12 10:31:43 +01:00
Leo Hemsted
20c39d24b7 Merge pull request #863 from alphagov/allow-partial-service-updates 
Allow partial service updates from service API client
 2016-08-12 10:07:55 +01:00
Leo Hemsted
6d27d568fe Merge pull request #865 from alphagov/remove-noti-stats 
remove unused call to notification statistics
 2016-08-11 17:32:07 +01:00
Chris Hill-Scott
955566b127 Don’t allow changing service users on update 2016-08-11 17:10:10 +01:00
Chris Hill-Scott
da1fa2e61c Make _attach_current_user a pure function 
Mutating dictionaries is gross and doesn’t work as you’d expect. Better
to have the function return a new dictionary instead.

Means we can be explicit that `created_by` is one of the allowed params
when updating a service.
 2016-08-11 17:07:55 +01:00
Chris Hill-Scott
0cfe10639a Only allow update service to modify named attrs 
To prevent typos and inadvertently updating something we shouldn’t,
this adds some filtering to the update_service method to make sure it
is only allowed to update certain attributes of a service.
 2016-08-11 17:07:43 +01:00
Chris Hill-Scott
002b58a062 Make service API client do partial updates 
The service API client was updating every attribute of a service. Which,
while kinda clunky, is fine…

…until something calling it doesn’t pass in every attribute of the
current service. It was then defaulting optional parameters to `None`.
Which resulted in a bug whereby every time a service was set to live,
its `reply_to_address` and `sms_sender_name` got overwritten to be
empty.

This commit changes the `update` method to only require the service ID,
and pass whatever other named arguments it received straight through to
the API. The API handles partial updates just fine (I think).
 2016-08-11 17:07:33 +01:00
Chris Hill-Scott
a809ef59fb Merge pull request #861 from alphagov/trial-mode-api-keys 
Talk about trial mode on API keys page
 2016-08-11 16:44:16 +01:00
Chris Hill-Scott
497a9548e3 Merge pull request #859 from alphagov/point-documentation-at-clients 
Link to client documentation, not API documentation
 2016-08-11 16:44:14 +01:00
Leo Hemsted
6fc474a37f remove unused call to notification statistics 2016-08-11 12:07:50 +01:00
Chris Hill-Scott
e82cb21ecc Talk about trial mode on API keys page 
When you make a ‘normal’ API key it won’t work as described until your
serivce is live.

We should make this clear at the point at which you choose this key.
 2016-08-10 17:04:22 +01:00
Leo Hemsted
e94a00850a remove unused file 2016-08-10 15:40:41 +01:00