Conflicts: - `config/initializers/cors.rb`: Upstream refactored this file, and glitch-soc had local changes. I could not find the rationale for the glitch-soc changes, so I used upstream's version.local
commit
d7fcd70023
16 changed files with 114 additions and 121 deletions
@ -1,40 +1,36 @@ |
||||
= simple_form_for @role, url: @role.new_record? ? admin_roles_path : admin_role_path(@role) do |f| |
||||
= render 'shared/error_messages', object: @role |
||||
= render 'shared/error_messages', object: form.object |
||||
|
||||
- if @role.everyone? |
||||
.flash-message.info |
||||
= t('admin.roles.everyone_full_description_html') |
||||
- else |
||||
.fields-group |
||||
= f.input :name, wrapper: :with_label |
||||
|
||||
- unless current_user.role.id == @role.id |
||||
.fields-group |
||||
= f.input :position, wrapper: :with_label, input_html: { max: current_user.role.position - 1 } |
||||
- if form.object.everyone? |
||||
.flash-message.info |
||||
= t('admin.roles.everyone_full_description_html') |
||||
- else |
||||
.fields-group |
||||
= form.input :name, wrapper: :with_label |
||||
|
||||
- unless current_user.role == form.object |
||||
.fields-group |
||||
= f.input :color, wrapper: :with_label, input_html: { placeholder: '#000000', type: 'color' } |
||||
= form.input :position, wrapper: :with_label, input_html: { max: current_user.role.position - 1 } |
||||
|
||||
%hr.spacer/ |
||||
.fields-group |
||||
= form.input :color, wrapper: :with_label, input_html: { placeholder: '#000000', type: 'color' } |
||||
|
||||
.fields-group |
||||
= f.input :highlighted, wrapper: :with_label |
||||
%hr.spacer/ |
||||
|
||||
%hr.spacer/ |
||||
.fields-group |
||||
= form.input :highlighted, wrapper: :with_label |
||||
|
||||
- unless current_user.role.id == @role.id |
||||
%hr.spacer/ |
||||
|
||||
.field-group |
||||
.input.with_block_label |
||||
%label= t('simple_form.labels.user_role.permissions_as_keys') |
||||
%span.hint= t('simple_form.hints.user_role.permissions_as_keys') |
||||
- unless current_user.role == form.object |
||||
|
||||
- (@role.everyone? ? UserRole::Flags::CATEGORIES.slice(:invites) : UserRole::Flags::CATEGORIES).each do |category, permissions| |
||||
%h4= t(category, scope: 'admin.roles.categories') |
||||
.field-group |
||||
.input.with_block_label |
||||
%label= t('simple_form.labels.user_role.permissions_as_keys') |
||||
%span.hint= t('simple_form.hints.user_role.permissions_as_keys') |
||||
|
||||
= f.input :permissions_as_keys, collection: permissions, wrapper: :with_block_label, include_blank: false, label_method: ->(privilege) { safe_join([t("admin.roles.privileges.#{privilege}"), content_tag(:span, t("admin.roles.privileges.#{privilege}_description"), class: 'hint')]) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', label: false, hint: false, disabled: permissions.filter { |privilege| UserRole::FLAGS[privilege] & current_user.role.computed_permissions == 0 } |
||||
- (form.object.everyone? ? UserRole::Flags::CATEGORIES.slice(:invites) : UserRole::Flags::CATEGORIES).each do |category, permissions| |
||||
%h4= t(category, scope: 'admin.roles.categories') |
||||
|
||||
%hr.spacer/ |
||||
= form.input :permissions_as_keys, collection: permissions, wrapper: :with_block_label, include_blank: false, label_method: ->(privilege) { safe_join([t("admin.roles.privileges.#{privilege}"), content_tag(:span, t("admin.roles.privileges.#{privilege}_description"), class: 'hint')]) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', label: false, hint: false, disabled: permissions.filter { |privilege| UserRole::FLAGS[privilege] & current_user.role.computed_permissions == 0 } |
||||
|
||||
.actions |
||||
= f.button :button, @role.new_record? ? t('admin.roles.add_new') : t('generic.save_changes'), type: :submit |
||||
%hr.spacer/ |
||||
|
@ -1,4 +1,7 @@ |
||||
- content_for :page_title do |
||||
= t('admin.roles.add_new') |
||||
|
||||
= render partial: 'form' |
||||
= simple_form_for @role, url: admin_roles_path do |form| |
||||
= render partial: 'form', object: form |
||||
.actions |
||||
= form.button :button, t('admin.roles.add_new'), type: :submit |
||||
|
@ -1,14 +1,10 @@ |
||||
= simple_form_for @webhook, url: @webhook.new_record? ? admin_webhooks_path : admin_webhook_path(@webhook) do |f| |
||||
= render 'shared/error_messages', object: @webhook |
||||
= render 'shared/error_messages', object: form.object |
||||
|
||||
.fields-group |
||||
= f.input :url, wrapper: :with_block_label, input_html: { placeholder: 'https://' } |
||||
.fields-group |
||||
= form.input :url, wrapper: :with_block_label, input_html: { placeholder: 'https://' } |
||||
|
||||
.fields-group |
||||
= f.input :events, collection: Webhook::EVENTS, wrapper: :with_block_label, include_blank: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', disabled: Webhook::EVENTS.filter { |event| !current_user.role.can?(Webhook.permission_for_event(event)) } |
||||
.fields-group |
||||
= form.input :events, collection: Webhook::EVENTS, wrapper: :with_block_label, include_blank: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', disabled: Webhook::EVENTS.filter { |event| !current_user.role.can?(Webhook.permission_for_event(event)) } |
||||
|
||||
.fields-group |
||||
= f.input :template, wrapper: :with_block_label, input_html: { placeholder: '{ "content": "Hello {{object.username}}" }' } |
||||
|
||||
.actions |
||||
= f.button :button, @webhook.new_record? ? t('admin.webhooks.add_new') : t('generic.save_changes'), type: :submit |
||||
.fields-group |
||||
= form.input :template, wrapper: :with_block_label, input_html: { placeholder: '{ "content": "Hello {{object.username}}" }' } |
||||
|
@ -1,4 +1,7 @@ |
||||
- content_for :page_title do |
||||
= t('admin.webhooks.edit') |
||||
|
||||
= render partial: 'form' |
||||
= simple_form_for @webhook, url: admin_webhook_path(@webhook) do |form| |
||||
= render partial: 'form', object: form |
||||
.actions |
||||
= form.button :button, t('generic.save_changes'), type: :submit |
||||
|
@ -1,4 +1,7 @@ |
||||
- content_for :page_title do |
||||
= t('admin.webhooks.new') |
||||
|
||||
= render partial: 'form' |
||||
= simple_form_for @webhook, url: admin_webhooks_path do |form| |
||||
= render partial: 'form', object: form |
||||
.actions |
||||
= form.button :button, t('admin.webhooks.add_new'), type: :submit |
||||
|
Loading…
Reference in new issue