Commit Graph

1139 Commits

Author SHA1 Message Date
Rebecca Law
d003dc4aa9 [WIP]: fixing unit tests 2016-03-18 10:49:22 +00:00
Rebecca Law
7eb4bcc592 Remove unused method
Added more tests
2016-03-17 14:25:28 +00:00
Rebecca Law
b28fbc16d7 A platform admin user is able to see a list of all services.
Each service on the list is linked to the dashboard page of the service.
The platform admin user can see/edit templates, see/invite users, see/edit service settings.
The platform admin user can not send messages, see/edit api keys and developer docs.
2016-03-17 10:46:47 +00:00
Rebecca Law
cc15d92aaa Merge pull request #286 from alphagov/always-return-password-resent-page
Fix to forgot password
2016-03-16 14:39:42 +00:00
Rebecca Law
271e194e1c Should show the sent password reset link page when the user is not found. 2016-03-16 14:19:41 +00:00
Chris Hill-Scott
2292ea4d15 Merge pull request #278 from alphagov/revert-201-stub-send-letters
Revert "Stub out the send letters page"
2016-03-16 11:11:31 +00:00
Adam Shimali
693433e2f8 Merge pull request #284 from alphagov/do-not-send-email
Do not send email in case of invite.
2016-03-15 17:15:15 +00:00
Adam Shimali
4adbcebc6f Do not send email in case of invite.
The user does not have to validate the email token, but it
was still being sent.
2016-03-15 16:58:26 +00:00
NIcholas Staples
4782d8ca1f Merge pull request #273 from alphagov/add_service_manager_message
added message if not templates and doesn't have ability to add templa…
2016-03-15 15:59:59 +00:00
Adam Shimali
e658793a83 Merge pull request #283 from alphagov/already-user-invite-bug-fix
Accept invite if user already part of service bug fix
2016-03-15 15:48:16 +00:00
Adam Shimali
7dca13407c Additional check needed to see if user was already a user for the
service that they were invited to.
2016-03-15 15:32:30 +00:00
minglis
803cb60402 Merge pull request #267 from alphagov/set-up-api-integration-link
Add page explaining how to send template using API
2016-03-15 12:03:02 +00:00
Rebecca Law
5ae582f9be Remove reference to deleted endpoint 2016-03-15 12:02:03 +00:00
Martyn Inglis
98833497dd Merge branch 'master' of github.com:alphagov/notifications-admin 2016-03-15 09:36:52 +00:00
Nicholas Staples
a23b55c258 Changed div container to p tag. 2016-03-15 09:06:22 +00:00
Chris Hill-Scott
9827c83879 Revert "Stub out the send letters page"
Reverts alphagov/notifications-admin#201
2016-03-15 08:33:51 +00:00
Chris Hill-Scott
8e7b0edc4d Add page explaining how to send template using API
Would like to test something like this and see how well it works.

Intention of having this page is so:
- template IDs are discoverable (https://www.pivotaltracker.com/story/show/115404593)
- it’s obvious there’s an ‘automated’ way to send messages, as well as the CSV
  way (we’ve seen people oblivious to this in research)
2016-03-15 07:11:01 +00:00
Adam Shimali
a647d713a6 Merge pull request #276 from alphagov/next-from-sign-in
The verify view was not passing along the next param to the two factor
2016-03-14 17:26:11 +00:00
Martyn Inglis
71abecf34c Merge branch 'master' of github.com:alphagov/notifications-admin 2016-03-14 17:06:19 +00:00
Adam Shimali
8561391cd2 The verify view was not passing along the next param to the two factor
view.

Now if it is passed and it is a url on the same domain that request
originates from then it is used.
2016-03-14 16:58:39 +00:00
Chris Hill-Scott
05947d047a Merge pull request #262 from alphagov/spreadsheet-fixes
Make preview of uploaded CSV files clearer
2016-03-14 16:57:46 +00:00
Chris Hill-Scott
91b4545adc Don’t mix errors with valid rows
Brings in: https://github.com/alphagov/notifications-utils/pull/11

Changes the number of rows shown to be at most 15 (either 15 rows with errors
or 15 valid rows.
2016-03-14 16:53:21 +00:00
Martyn Inglis
6c5f9f4cb2 Fix ordering of jobs 2016-03-14 16:50:02 +00:00
Chris Hill-Scott
41b278359c Start row numbers from 2
Because row 1 will be the column headers when you look at a CSV file in Excel.
2016-03-14 14:17:16 +00:00
Rebecca Law
00fdb658c6 Merge pull request #274 from alphagov/remove-unused-config
Remove unused config
2016-03-14 13:46:15 +00:00
Adam Shimali
67484d3f35 Merge pull request #269 from alphagov/invite-registration-sms-only
Change new invite registration flow to only need
2016-03-14 10:55:31 +00:00
Rebecca Law
b3416c48e8 Remove unused config 2016-03-14 10:54:19 +00:00
Nicholas Staples
44e126f09c added message if not templates and doesn't have ability to add templates. 2016-03-14 10:49:11 +00:00
Chris Hill-Scott
a4d00cf67e Merge pull request #266 from alphagov/better-placeholder-guidance
Fix bugs and gripes with adding and editing templates
2016-03-14 10:45:00 +00:00
Chris Hill-Scott
144de21745 Make nav and page headings reflect permissions
> If you have the Edit templates permission but not the Send messages permission, the navigation should read
>
> - Text message templates
> - Email templates
> - Letter templates
>
> The page headings should also read
>
> - Text message templates
> - Email templates
> - Letter templates

respectively

https://www.pivotaltracker.com/story/show/115488955
2016-03-14 10:39:53 +00:00
Chris Hill-Scott
eea8ae5be4 Move ‘new thing’ buttons alongside heading
On the send messages and manage team pages we have big green buttons for
adding/inviting a new template or team member.

On the add template page it was at the bottom, and often got missed.

On the manage team page it was at the top, but maybe too prominent because it’s
big and green.

This commit tries putting it in the top right of the page instead (except when
the template page is empty, in which case it’s unchanged).
2016-03-14 10:39:53 +00:00
Chris Hill-Scott
370fd68a2c Fix innaccurate headings on add/edit template page
The same `.html` file is shared between adding a template and editing a
template.

The page heading needs to be contextual to the URL, either ‘add’ or ‘edit’.
Somewhere along the way this got lost; this commit reinstates it.
2016-03-14 10:39:52 +00:00
Chris Hill-Scott
b4e6f734c8 Reword the help text about adding placeholders
In research we’ve seen users struggle with this. Often they’d type
((Joe Bloggs)) or ((XX/XX/XXXX)) instead of a sensible name.

Lets see if explaining it differently helps.
2016-03-14 10:39:52 +00:00
Chris Hill-Scott
562fc4e73c Remove ‘cancel’ links from edit template page
Since cancel just takes you back to the list of templates, which is accessible
from the left nav, it’s only adding clutter to the page.
2016-03-14 10:39:52 +00:00
Adam Shimali
164bdad4f2 Change new invite registration flow to only need
sms for verification.

This may change again soon with story to split 2 factor
pages, but for now is correct.
2016-03-14 09:43:34 +00:00
NIcholas Staples
f41e762d98 Merge pull request #270 from alphagov/fix-error-styling-invite-page
Fix error message spacing on yes/no pattern
2016-03-14 09:43:19 +00:00
NIcholas Staples
cf195b3a16 Merge pull request #271 from alphagov/remove-dao-layer
Start to remove the dao layer
2016-03-14 09:42:22 +00:00
NIcholas Staples
bf57124817 Merge pull request #272 from alphagov/remove-sender
Remove sender module, code was moved to api.
2016-03-14 09:41:06 +00:00
Chris Hill-Scott
e1e86e4df5 Fix error message spacing on yes/no pattern
Error messages were added to the yes/no fields on the invite user page in:
4c323a9a99

This commit fixes the margins and padding on these fields so they look
consistent with how we do validation errors elsewhere.
t
2016-03-14 09:13:28 +00:00
Rebecca Law
34e7d21855 Remove sender module, code was moved to api. 2016-03-13 09:39:29 +00:00
Rebecca Law
6e3bf97af4 Remove services_dao.insert_new_service.
Update api_client.create_service to return the service id.
Fix unit tests.
2016-03-13 09:37:17 +00:00
Rebecca Law
9d2fbca557 Merge pull request #264 from alphagov/fix-sign-in-tests
Fix to sign in test and user model
2016-03-11 14:59:49 +00:00
Chris Hill-Scott
d1e83d1196 Merge pull request #261 from alphagov/unbreak-my-links
Fix broken links in yellow box on dashboard
2016-03-11 14:09:44 +00:00
Adam Shimali
f8b212fd21 Merge pull request #265 from alphagov/invite-permissions-fix
Bug fix for passing list of empty string if no permissions selected for
2016-03-11 13:55:06 +00:00
Adam Shimali
069a549d57 Bug fix for passing list of empty string if no permissions selected for
invite.

Send empty list instead.
2016-03-11 12:50:25 +00:00
Rebecca Law
58c748e703 Noticed that the api was being called when running the unit tests.
This also lead me to find the the failed_login_in count was always returning 0.
2016-03-11 11:47:21 +00:00
Rebecca Law
f81dccc513 Merge pull request #263 from alphagov/error-handling
Fix bug in error handlers.
2016-03-11 10:52:53 +00:00
Rebecca Law
ccaa5410b3 Removed test as it was not testing the right thing 2016-03-11 10:47:16 +00:00
Rebecca Law
f63a85d003 Fix bug in error handlers.
Correct spelling error
2016-03-11 10:16:06 +00:00
Chris Hill-Scott
d9fd1d5117 Fix broken links in yellow box on dashboard
Links were missing the double mustaches.
2016-03-11 08:43:45 +00:00