Admin UI 1675

[RobTilton]

Problem

#1675 Admin UI Bug

Solution

Modification to add_success_message, Adding tracking of IMPORT_TYPE_DELETE and IMPORT_TYPE_SKIP.
Modifications where made to a number of Test to insure expected Results where up to date.

Acceptance Criteria
The Test I have added is test_import_for_deletion line 143 of test_admin_integration

What the Message looks like now:

I have NOT added the changes to the documentation.

1 Failed Test, Import Legacy Book, Failure due to incorrect string return.

[matthewhegarty]

Looks good, thanks.

I suggest some minor changes. First this should go into the release-4 branch (not main). This is because we are changing a public facing message which other implementations may rely on.

The best way to do this from your Admin_UI_1675 branch

# take a backup of existing branch
git branch Admin_UI_1675-bak

git merge release-4

This will give you some conflicts (i.e. in the tests) which you will have to resolve. You can add your new tests to the tests/admin_integration/test_import.py module in release-4.

Then when all your tests pass, you can push to the remote branch and I'll take it from there. Let me know if you need any guidance with this.

Also, please install pre-commit for formatting purposes (see docs).

If you could also add an entry to changelog.rst that would be appreciated.

[RobTilton]

Regarding
Git merge release-4
Not something we can merge.
I'm not sure how I am to merge a branch from your repo, into a branch on my fork.

Never mind, I found the commands needed.

[matthewhegarty]

Thanks Rob - I have changed the base branch on the PR to release-4 and we now have your changes, but we're missing the tests.

[RobTilton]

working tests now, seems to be String related again, should be done within the next hour. If nothing comes up.

[matthewhegarty]

One change required for failing tests. I will add this fix now. You will need to do a git pull to get my changes.