diff --git a/src/translation/en.json b/src/translation/en.json index 6a895dd09..8deeb1464 100644 --- a/src/translation/en.json +++ b/src/translation/en.json @@ -922,7 +922,8 @@ "reportPlaceholder": "Describe your issue", "emailPlaceholder": "If needed, provide an email address different from above to reach you", "emailVerifyAction": "Verify now", - "emailNotVerified": "Your cloudron.io account email {{ email }} is not verified. Please verify it to open support tickets." + "emailNotVerified": "Your cloudron.io account email {{ email }} is not verified. Please verify it to open support tickets.", + "communityAppDisclaimer": "We only provide support via tickets for apps installed from the Core repository. Please ask in our forum instead." }, "remoteSupport": { "title": "Remote Support", diff --git a/src/views/support.html b/src/views/support.html index ebdacd2fb..d66f8be3c 100644 --- a/src/views/support.html +++ b/src/views/support.html @@ -42,6 +42,9 @@ + +

{{ 'support.ticket.communityAppDisclaimer' | tr }}

+
@@ -59,7 +62,7 @@ {{ 'support.ticket.sshCheckbox' | tr }}
- + {{feedback.error}} {{feedback.result.message}} diff --git a/src/views/support.js b/src/views/support.js index dc0beb17b..2250e37e7 100644 --- a/src/views/support.js +++ b/src/views/support.js @@ -10,6 +10,7 @@ angular.module('Application').controller('SupportController', ['$scope', '$locat $scope.config = Client.getConfig(); $scope.user = Client.getUserInfo(); $scope.apps = Client.getInstalledApps(); + $scope.appsById = {}; $scope.supportConfig = null; $scope.feedback = { @@ -105,6 +106,8 @@ angular.module('Application').controller('SupportController', ['$scope', '$locat Client.getRemoteSupport(function (error, enabled) { if (error) return console.error(error); + Client.getInstalledApps().forEach(function (app) { $scope.appsById[app.id] = app; }); + $scope.sshSupportEnabled = enabled; $scope.ready = true; });