diff --git a/app/assets/stylesheets/content/_index.sass b/app/assets/stylesheets/content/_index.sass index b4b203428d..14d5064fc6 100644 --- a/app/assets/stylesheets/content/_index.sass +++ b/app/assets/stylesheets/content/_index.sass @@ -64,6 +64,7 @@ @import content/hide_until_initialized @import content/hidden @import content/search +@import content/security_badge @import content/contextual @import content/tooltip @import content/grid diff --git a/app/assets/stylesheets/content/_security_badge.sass b/app/assets/stylesheets/content/_security_badge.sass new file mode 100644 index 0000000000..739cfef871 --- /dev/null +++ b/app/assets/stylesheets/content/_security_badge.sass @@ -0,0 +1,6 @@ +.security-badge--container + height: 28px + +.security-badge--help-icon + position: relative + top: -8px diff --git a/app/helpers/security_badge_helper.rb b/app/helpers/security_badge_helper.rb index d7c6c10c66..79109b2eff 100644 --- a/app/helpers/security_badge_helper.rb +++ b/app/helpers/security_badge_helper.rb @@ -41,4 +41,8 @@ module SecurityBadgeHelper uri.query = info.to_query uri.to_s end + + def display_security_badge_graphic? + OpenProject::Configuration.security_badge_displayed? && Setting.security_badge_displayed? + end end diff --git a/app/models/permitted_params.rb b/app/models/permitted_params.rb index 76bea5f06f..3964c4dedd 100644 --- a/app/models/permitted_params.rb +++ b/app/models/permitted_params.rb @@ -108,7 +108,10 @@ class PermittedParams end def group - params.require(:group).permit(*self.class.permitted_attributes[:group]) + permitted_params = params.require(:group).permit(*self.class.permitted_attributes[:group]) + permitted_params = permitted_params.merge(custom_field_values(:group)) + + permitted_params end def group_membership diff --git a/app/views/admin/info.html.erb b/app/views/admin/info.html.erb index 708a740ce7..352d0b3057 100644 --- a/app/views/admin/info.html.erb +++ b/app/views/admin/info.html.erb @@ -48,13 +48,18 @@ See docs/COPYRIGHT.rdoc for more details. <%= OpenProject::Info.versioned_name %> (<%= @db_adapter_name %>) - <% if Setting.security_badge_displayed? %> + <% if display_security_badge_graphic? %>