consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show request to admins and short description only for resources

Browse Source
This commit is contained in:
decabeza
2019-04-13 16:25:50 +02:00
parent 17d4af31ae
commit 07fd5084f7
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/views/admin/dashboard/actions/_form.html.erb
View File

@@ -5,7 +5,8 @@
<%= f.label :action_type %> <%= f.label :action_type %>
<% ::Dashboard::Action.action_types.keys.each do |action_type_value| %> <% ::Dashboard::Action.action_types.keys.each do |action_type_value| %>
<span class="margin-right"> <span class="margin-right">
<%= f.radio_button :action_type, action_type_value, label: false %> <%= f.radio_button :action_type, action_type_value, label: false,
data: {toggle: "request_to_administrators short_description"} %>
<%= f.label "action_type_#{action_type_value}", t("admin.dashboard.actions.action_type.#{action_type_value}") %> <%= f.label "action_type_#{action_type_value}", t("admin.dashboard.actions.action_type.#{action_type_value}") %>
</span> </span>
<% end %> <% end %>
@@ -15,7 +16,8 @@
<%= f.check_box :active, label: ::Dashboard::Action.human_attribute_name(:active) %> <%= f.check_box :active, label: ::Dashboard::Action.human_attribute_name(:active) %>
</div> </div>
<div class="small-12 column margin-bottom"> <div id="request_to_administrators" class="small-12 column margin-bottom hide"
data-toggler=".hide">
<%= f.check_box :request_to_administrators, label: ::Dashboard::Action.human_attribute_name(:request_to_administrators) %> <%= f.check_box :request_to_administrators, label: ::Dashboard::Action.human_attribute_name(:request_to_administrators) %>
</div> </div>
@@ -26,11 +28,12 @@
<%= f.label :title %> <%= f.label :title %>
<%= f.text_field :title, label: false %> <%= f.text_field :title, label: false %>
<%= f.label :short_description %> <div id="short_description" class="hide">
<%= f.text_field :short_description, label: false %> <%= f.label :short_description %>
<%= f.text_field :short_description, label: false %>
</div>
<%= f.cktext_area :description, <%= f.cktext_area :description, ckeditor: { language: I18n.locale } %>
ckeditor: { language: I18n.locale } %>
</div> </div>
</div> </div>

2
spec/shared/features/nested_documentable.rb
View File

@@ -371,7 +371,7 @@ end
def documentable_fill_new_valid_dashboard_action def documentable_fill_new_valid_dashboard_action
fill_in :dashboard_action_title, with: "Dashboard title" fill_in :dashboard_action_title, with: "Dashboard title"
fill_in :dashboard_action_short_description, with: "Dashboard description" fill_in_ckeditor :dashboard_action_description, with: "Dashboard description"
end end
def documentable_fill_new_valid_budget_investment def documentable_fill_new_valid_budget_investment