Skip to content

Commit

Permalink
Fixes #35168 - stop using single quotes that were breaking translatio…
Browse files Browse the repository at this point in the history
…ns (#10360)

(cherry picked from commit 1675030)
  • Loading branch information
jeremylenz authored and sjha4 committed Dec 2, 2022
1 parent ade139d commit 3cd810a
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions engines/bastion/app/views/bastion/layouts/assets.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,18 @@
angular.module('Bastion').value('simpleContentAccessEnabled', <%= Organization.current.simple_content_access? if Organization.current %>);
angular.module('Bastion').value('isManifestImported', <%= !!Organization.current&.manifest_imported?(cached: true) %>)
angular.module('Bastion').value('foreman', tfm);
angular.module('Bastion').value('repositoryTypes', angular.fromJson('<%= Katello::RepositoryTypeManager.enabled_repository_types.values.to_json.html_safe %>'));
angular.module('Bastion').value('deleteHostOnUnregister', angular.fromJson('<%= Setting[:unregister_delete_host] %>'));
angular.module('Bastion').value('globalContentProxy', angular.fromJson('<%= Setting[:content_default_http_proxy].empty? ? nil.to_json : Setting[:content_default_http_proxy].to_json.html_safe %>'));
angular.module('Bastion').value('repositoryTypes', angular.fromJson(`<%= Katello::RepositoryTypeManager.enabled_repository_types.values.to_json.html_safe %>`));
angular.module('Bastion').value('deleteHostOnUnregister', angular.fromJson(`<%= Setting[:unregister_delete_host] %>`));
angular.module('Bastion').value('globalContentProxy', angular.fromJson(`<%= Setting[:content_default_http_proxy].empty? ? nil.to_json : Setting[:content_default_http_proxy].to_json.html_safe %>`));
angular.module('Bastion').value('entriesPerPage', "<%= Setting[:entries_per_page] %>");
angular.module('Bastion').value('contentViewSolveDependencies', "<%= Setting[:content_view_solve_dependencies] %>");
angular.module('Bastion').constant('BastionConfig', angular.fromJson('<%= Bastion.config.to_json.html_safe %>'));
angular.module('Bastion').constant('BastionConfig', angular.fromJson(`<%= Bastion.config.to_json.html_safe %>`));
angular.module('Bastion.auth').value('CurrentUser', {
id: <%= User.current.id %>,
admin: <%= User.current.admin || User.current.usergroups.any? { |group| group.admin } %>
});
angular.module('Bastion.auth').value('Permissions', angular.fromJson('<%= User.current.cached_roles.collect { |role| role.permissions }.flatten.to_json.html_safe %>'));
angular.module('Bastion.auth').value('Permissions', angular.fromJson(`<%= User.current.cached_roles.collect { |role| role.permissions }.flatten.to_json.html_safe %>`));
angular.module('Bastion').value('newHostDetailsUI', "<%= Setting[:host_details_ui] %>");
</script>
<% Bastion.plugins.each do |name, plugin| %>
<%= include_plugin_js(plugin) %>
Expand Down

0 comments on commit 3cd810a

Please sign in to comment.