This commit is contained in:
Karel Picman 2018-01-25 10:27:36 +01:00
parent 038198ede7
commit 28f9ab48ff
5 changed files with 36 additions and 8 deletions

View File

@ -338,9 +338,6 @@ class DmsfController < ApplicationController
def add_email
@principals = users_for_new_users
# respond_to do |format|
# format.js
# end
end
def append_email

View File

@ -20,6 +20,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%>
$('#ajax-modal').html("<%= escape_javascript(render :partial => 'dmsf/add_email', :locals => { :emails => 'xxx'}) %>");
$('#ajax-modal').html("<%= escape_javascript(render :partial => 'dmsf/add_email') %>");
showModal('ajax-modal', '400px');
$('#ajax-modal').addClass('new-user');

View File

@ -20,6 +20,4 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%>
$('#users_for_watcher').html('<%= escape_javascript(render_principals_for_new_email(@principals)) %>');
$('#users_for_watcher').html('<%= escape_javascript(
render_principals_for_new_folder_permissions(@principals)) %>');
$('#users_for_watcher').html('<%= escape_javascript(render_principals_for_new_folder_permissions(@principals)) %>');

View File

@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%>
$('#users_for_watcher').html('<%= escape_javascript(render_principals_for_new_email(@principals)) %>');
$('#users_for_watcher').html('<%= escape_javascript(render_principals_for_new_folder_permissions(@principals)) %>');
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'dmsf_folder_permissions/new') %>');
showModal('ajax-modal', '400px');
$('#ajax-modal').addClass('new-user');

View File

@ -252,4 +252,37 @@ class DmsfControllerTest < RedmineDmsf::Test::TestCase
assert_select "input:match('value', ?)", Setting.plugin_redmine_dmsf['dmsf_documents_email_links_only']
end
def test_add_email_forbidden
xhr :get, :add_email, id: @project.id
assert_response :forbidden
end
def test_add_email
@role.add_permission! :view_dmsf_files
xhr :get, :add_email, id: @project.id
assert_response :success
end
def test_append_email_forbidden
post :append_email, :id => @project, :user_ids => @project.members.collect{ |m| m.user.id }, :format => 'js'
assert_response :forbidden
end
def test_append_email_forbidden
@role.add_permission! :view_dmsf_files
post :append_email, :id => @project, :user_ids => @project.members.collect{ |m| m.user.id }, :format => 'js'
assert_response :success
end
def test_autocomplete_for_user_forbidden
xhr :get, :autocomplete_for_user, id: @project.id
assert_response :forbidden
end
def test_autocomplete_for_user
@role.add_permission! :view_dmsf_files
xhr :get, :autocomplete_for_user, id: @project
assert_response :success
end
end