From 6a1bddc9bca4af0a69df3047f42e952d5d351c96 Mon Sep 17 00:00:00 2001 From: Brian Palmer Date: Thu, 23 Jun 2011 14:16:37 -0600 Subject: [PATCH] enable "download zip" link for students, closes #4305 Change-Id: Ifd22d7d79e21d0cc8a4d1326b062058f06f6a0dc Reviewed-on: https://gerrit.instructure.com/4357 Tested-by: Hudson Reviewed-by: Brian Whitmer --- app/stylesheets/full_files.sass | 10 ++++++ app/views/files/full_index.html.erb | 4 +-- lib/content_zipper.rb | 7 +++- public/javascripts/full_files.js | 5 +-- spec/factories/attachment_factory.rb | 8 +++-- spec/lib/content_zipper_spec.rb | 51 ++++++++++++++++++++++++++++ spec/selenium/files_sel.rb | 13 +++++++ 7 files changed, 90 insertions(+), 8 deletions(-) create mode 100644 spec/lib/content_zipper_spec.rb create mode 100644 spec/selenium/files_sel.rb diff --git a/app/stylesheets/full_files.sass b/app/stylesheets/full_files.sass index 9c9437ae39f..dc8311e1308 100644 --- a/app/stylesheets/full_files.sass +++ b/app/stylesheets/full_files.sass @@ -94,6 +94,16 @@ ul.instTree li.leaf .content_panel.addable_content_panel .links .sub_links display: block +.content_panel.downloadable_content_panel .links .sub_links + display: block + float: right + > span + visibility: hidden + > a + visibility: hidden + > .download_zip + visibility: visible + .content_panel #rename_entry_field font-size: 1.2em diff --git a/app/views/files/full_index.html.erb b/app/views/files/full_index.html.erb index 3c80581dcc2..4ee965e9049 100644 --- a/app/views/files/full_index.html.erb +++ b/app/views/files/full_index.html.erb @@ -90,13 +90,13 @@
  - <%= t 'links.add_file', "Add File" %> | + <%= t 'links.add_file', "Add File" %> | <%= t 'links.add_folder', "Add Folder" %> "><%= image_tag "inst_tree/file_types/page_white_zip.png" %> - ""><%= image_tag "file_upload.png" %> + "><%= image_tag "file_upload.png" %> "><%= image_tag "lock.png" %> diff --git a/lib/content_zipper.rb b/lib/content_zipper.rb index 046da0a72f6..f3a5d8c170e 100644 --- a/lib/content_zipper.rb +++ b/lib/content_zipper.rb @@ -275,7 +275,12 @@ class ContentZipper if callback && (folder.hidden? || folder.locked) callback.call(folder, folder_names) end - folder.file_attachments.scoped(:conditions => "file_state IN ('available', 'hidden')").select{|a| !@user || a.grants_right?(@user, nil, :download)}.each do |attachment| + attachments = if !@user || folder.context.grants_right?(@user, nil, :manage_files) + folder.active_file_attachments + else + folder.visible_file_attachments + end + attachments.select{|a| !@user || a.grants_right?(@user, nil, :download)}.each do |attachment| callback.call(attachment, folder_names) if callback @context = folder.context @logger.debug(" found attachment: #{attachment.unencoded_filename}") diff --git a/public/javascripts/full_files.js b/public/javascripts/full_files.js index 38e32bda74b..a3567ca4f96 100644 --- a/public/javascripts/full_files.js +++ b/public/javascripts/full_files.js @@ -1322,7 +1322,8 @@ var fileStructureData = []; $panel.find(".rename_item_link,.delete_item_link,.folder_url").attr('href', folder_url); $panel.find(".breadcrumb").empty().append(files.breadcrumb()); $panel.toggleClass('editable_content_panel', !!((data.context && data.context.permissions && data.context.permissions.manage_files) || (data.permissions && data.permissions.update))) - .toggleClass('addable_content_panel', !!((data.context && data.context.permissions && data.context.permissions.manage_files) || (data.permissions && data.permissions.update))); + .toggleClass('addable_content_panel', !!((data.context && data.context.permissions && data.context.permissions.manage_files) || (data.permissions && data.permissions.update))) + .toggleClass('downloadable_content_panel', !$panel.hasClass('editable_content_panel') && !$panel.hasClass('addable_content_panel') && !!(data.permissions && data.permissions.read_contents)); $panel.removeClass('to_be_hidden'); $panel.find(".download_zip,.upload_zip").hide(); @@ -2363,4 +2364,4 @@ var fileUpload = { attempt: 0, file_details: {} }; -}); \ No newline at end of file +}); diff --git a/spec/factories/attachment_factory.rb b/spec/factories/attachment_factory.rb index cf7d0ec422e..1ea00c24caf 100644 --- a/spec/factories/attachment_factory.rb +++ b/spec/factories/attachment_factory.rb @@ -37,9 +37,11 @@ def valid_attachment_attributes(opts={}) } end -def stub_png_data - sio = StringIO.new("ohai") - sio.stub!(:original_filename).and_return('test.png') +def stub_png_data(filename = 'test.png', data = nil) + $stub_file_counter ||= 0 + data ||= "ohai#{$stub_file_counter += 1}" + sio = StringIO.new(data) + sio.stub!(:original_filename).and_return(filename) sio.stub!(:content_type).and_return('image/png') sio end diff --git a/spec/lib/content_zipper_spec.rb b/spec/lib/content_zipper_spec.rb new file mode 100644 index 00000000000..c9e621e1b45 --- /dev/null +++ b/spec/lib/content_zipper_spec.rb @@ -0,0 +1,51 @@ +# +# Copyright (C) 2011 Instructure, Inc. +# +# This file is part of Canvas. +# +# Canvas is free software: you can redistribute it and/or modify it under +# the terms of the GNU Affero General Public License as published by the Free +# Software Foundation, version 3 of the License. +# +# Canvas is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU Affero General Public License for more +# details. +# +# You should have received a copy of the GNU Affero General Public License along +# with this program. If not, see . +# + +require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb') + +describe ContentZipper do + describe "zip_folder" do + it "should only zip up files/folders the user has access to" do + course_with_student(:active_all => true) + folder = Folder.root_folders(@course).first + attachment_model(:uploaded_data => stub_png_data('hidden.png'), :content_type => 'image/png', :hidden => true, :folder => folder) + attachment_model(:uploaded_data => stub_png_data('visible.png'), :content_type => 'image/png', :folder => folder) + attachment_model(:uploaded_data => stub_png_data('locked.png'), :content_type => 'image/png', :folder => folder, :locked => true) + hidden_folder = folder.sub_folders.create!(:context => @course, :name => 'hidden', :hidden => true) + visible_folder = folder.sub_folders.create!(:context => @course, :name => 'visible') + locked_folder = folder.sub_folders.create!(:context => @course, :name => 'locked', :locked => true) + attachment_model(:uploaded_data => stub_png_data('sub-hidden.png'), :content_type => 'image/png', :folder => hidden_folder) + attachment_model(:uploaded_data => stub_png_data('sub-vis.png'), :content_type => 'image/png', :folder => visible_folder) + attachment_model(:uploaded_data => stub_png_data('sub-locked.png'), :content_type => 'image/png', :folder => visible_folder, :locked => true) + attachment_model(:uploaded_data => stub_png_data('sub-locked-vis.png'), :content_type => 'image/png', :folder => locked_folder) + + attachment = Attachment.new(:display_name => 'my_download.zip') + attachment.user_id = @user.id + attachment.workflow_state = 'to_be_zipped' + attachment.context = folder + attachment.save! + ContentZipper.process_attachment(attachment, @user) + names = [] + attachment.reload + Zip::ZipFile.foreach(attachment.full_filename) do |f| + names << f.name if f.file? + end + names.sort.should == ['visible.png', 'visible/sub-vis.png'] + end + end +end diff --git a/spec/selenium/files_sel.rb b/spec/selenium/files_sel.rb new file mode 100644 index 00000000000..3b459728ef6 --- /dev/null +++ b/spec/selenium/files_sel.rb @@ -0,0 +1,13 @@ +require File.expand_path(File.dirname(__FILE__) + '/common') + +describe "files view" do + it_should_behave_like "in-process server selenium tests" + + it "should show students link to download zip of folder" do + course_with_student_logged_in + get "/courses/#{@course.id}/files" + link = keep_trying_until { driver.find_element(:css, "div.links a.download_zip_link") } + link.should be_displayed + link.attribute('href').should match(%r"/courses/#{@course.id}/folders/\d+/download") + end +end