From ddbc22b274fbf3cec07fdee69175f3f00dfcccd2 Mon Sep 17 00:00:00 2001
From: Urban Rotnik <urban.rotnik@gmail.com>
Date: Tue, 19 Jan 2021 09:47:08 +0100
Subject: [PATCH] Fix folders exports, add error message

SCI-5351
---
 app/assets/javascripts/projects/index.js | 4 ++--
 app/controllers/teams_controller.rb      | 2 ++
 app/models/project_folder.rb             | 4 +---
 config/locales/en.yml                    | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/projects/index.js b/app/assets/javascripts/projects/index.js
index 209460858..a7bc7103f 100644
--- a/app/assets/javascripts/projects/index.js
+++ b/app/assets/javascripts/projects/index.js
@@ -180,8 +180,8 @@
           // Show the modal
           exportProjectsModal.modal('show');
         },
-        error: function() {
-          // TODO
+        error: function(data) {
+          HelperModule.flashAlertMsg(data.responseJSON.flash, 'danger');
         }
       });
     });
diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb
index 97b93dd0e..3b26b114f 100644
--- a/app/controllers/teams_controller.rb
+++ b/app/controllers/teams_controller.rb
@@ -65,6 +65,8 @@ class TeamsController < ApplicationController
           status: 'error'
         }
       end
+    else
+      render json: { flash: I18n.t('projects.export_projects.zero_projects_flash') }, status: :unprocessable_entity
     end
   end
 
diff --git a/app/models/project_folder.rb b/app/models/project_folder.rb
index bb6210200..e752e9106 100644
--- a/app/models/project_folder.rb
+++ b/app/models/project_folder.rb
@@ -87,9 +87,7 @@ class ProjectFolder < ApplicationRecord
   end
 
   def inner_projects
-    project_folders.map do |inner_folder|
-      projects + inner_folder.inner_projects
-    end.flatten
+    Project.where(project_folder: ProjectFolder.inner_folders(team, self) + [self])
   end
 
   private
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0c9a765e5..2db9e8bca 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -460,6 +460,7 @@ en:
       modal_text_p3_html: "Please note that the number of exports is limited to %{limit} requests per day. After you confirm this export you will have %{num} left."
       modal_submit: "Export"
       success_flash: "Export request received. Your export request is being processed."
+      zero_projects_flash: "You have to select at least one project"
     activity:
       visibility_hidden: "Project members only"
       visibility_visible: "All team members"