From 1be2068bcf4c7365fb29f6d7c0c42d1a78ea4110 Mon Sep 17 00:00:00 2001 From: Peter Fogg Date: Fri, 28 Jun 2013 11:37:37 -0400 Subject: [PATCH] Show a confirmation on asset delete. Fixes STUD-375. --- cms/djangoapps/contentstore/features/upload.feature | 1 + cms/djangoapps/contentstore/features/upload.py | 6 ++++++ cms/static/js/views/assets.js | 6 +++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cms/djangoapps/contentstore/features/upload.feature b/cms/djangoapps/contentstore/features/upload.feature index b3c1fc2ce3..8d40163685 100644 --- a/cms/djangoapps/contentstore/features/upload.feature +++ b/cms/djangoapps/contentstore/features/upload.feature @@ -21,6 +21,7 @@ Feature: Upload Files When I upload the file "test" And I delete the file "test" Then I should not see the file "test" was uploaded + And I see a confirmation that the file was deleted Scenario: Users can download files Given I have opened a new course in studio diff --git a/cms/djangoapps/contentstore/features/upload.py b/cms/djangoapps/contentstore/features/upload.py index 258fc5ebcf..bc06c97f9c 100644 --- a/cms/djangoapps/contentstore/features/upload.py +++ b/cms/djangoapps/contentstore/features/upload.py @@ -90,6 +90,12 @@ def modify_upload(_step, file_name): cur_file.write(new_text) +@step('I see a confirmation that the file was deleted') +def i_see_a_delete_confirmation(step): + alert_css = '#alert-confirmation' + assert world.is_css_present(alert_css) + + def get_index(file_name): names_css = 'td.name-col > a.filename' all_names = world.css_find(names_css) diff --git a/cms/static/js/views/assets.js b/cms/static/js/views/assets.js index 18ef131f52..e9ab2cb911 100644 --- a/cms/static/js/views/assets.js +++ b/cms/static/js/views/assets.js @@ -23,7 +23,11 @@ function removeAsset(e){ { 'location': row.data('id') }, function() { // show the post-commit confirmation - $(".wrapper-alert-confirmation").addClass("is-shown").attr('aria-hidden','false'); + var deleted = new CMS.Views.Alert.Confirmation({ + title: gettext("Your file has been deleted."), + closeIcon: false + }); + deleted.show(); row.remove(); analytics.track('Deleted Asset', { 'course': course_location_analytics,