diff --git a/app/assets/javascripts/projects/index.js b/app/assets/javascripts/projects/index.js index be0a8c124..1cafac49a 100644 --- a/app/assets/javascripts/projects/index.js +++ b/app/assets/javascripts/projects/index.js @@ -652,6 +652,8 @@ var ProjectsIndex = (function() { dropdownSelector.clearData($membersFilter); if ($createdOnFromFilter.data('DateTimePicker')) $createdOnFromFilter.data('DateTimePicker').clear(); if ($createdOnToFilter.data('DateTimePicker')) $createdOnToFilter.data('DateTimePicker').clear(); + $createdOnFromFilter.val(''); + $createdOnToFilter.val(''); if ($archivedOnFromFilter.data('DateTimePicker')) $archivedOnFromFilter.data('DateTimePicker').clear(); if ($archivedOnToFilter.data('DateTimePicker')) $archivedOnToFilter.data('DateTimePicker').clear(); $foldersCB.prop('checked', false); diff --git a/app/controllers/project_folders_controller.rb b/app/controllers/project_folders_controller.rb index 0162304d3..bd4577ec9 100644 --- a/app/controllers/project_folders_controller.rb +++ b/app/controllers/project_folders_controller.rb @@ -61,6 +61,7 @@ class ProjectFoldersController < ApplicationController render json: { html: render_to_string(partial: 'projects/index/modals/move_to_modal_contents', + formats: :html, locals: { items_label: items_label(params[:items]) }) } end @@ -85,6 +86,7 @@ class ProjectFoldersController < ApplicationController def destroy_modal render json: { html: render_to_string(partial: 'projects/index/modals/project_folder_delete', + formats: :html, locals: { project_folder_ids: params[:project_folder_ids] }) } end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 6e345870e..4c4b510de 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -155,6 +155,7 @@ class ProjectsController < ApplicationController def edit render json: { html: render_to_string(partial: 'projects/index/modals/edit_project_contents', + formats: :html, locals: { project: @project }) } end