remove sign now from archived

pull/257/head
Pete Matsyburka 2 years ago
parent f430b4f5a6
commit abbd3e809a

@ -61,7 +61,7 @@
</download-button> </download-button>
</button> </button>
</form> </form>
<% else %> <% elsif !submission.archived_at? && !template.archived_at? %>
<% if current_user.email == submitter.email %> <% if current_user.email == submitter.email %>
<form data-turbo="false" method="get" action="<%= submit_form_url(slug: submitter.slug) %>" class="flex-1 md:flex-none"> <form data-turbo="false" method="get" action="<%= submit_form_url(slug: submitter.slug) %>" class="flex-1 md:flex-none">
<button onclick="event.stopPropagation()" class="btn btn-sm btn-neutral btn-outline bg-white w-full md:w-36 flex"> <button onclick="event.stopPropagation()" class="btn btn-sm btn-neutral btn-outline bg-white w-full md:w-36 flex">
@ -80,7 +80,7 @@
<div class="flex-1 md:flex-none"> <div class="flex-1 md:flex-none">
<span class="btn btn-outline btn-sm w-full md:w-24">View</span> <span class="btn btn-outline btn-sm w-full md:w-24">View</span>
</div> </div>
<% if !submission.archived_at? && can?(:destroy, submission) %> <% if !submission.archived_at? && !template.archived_at? && can?(:destroy, submission) %>
<span data-tip="Archive" class="sm:tooltip tooltip-top"> <span data-tip="Archive" class="sm:tooltip tooltip-top">
<%= button_to button_title(title: nil, disabled_with: 'Arch', icon: svg_icon('archive', class: 'w-6 h-6')), submission_path(submission), class: 'btn btn-outline btn-sm w-full md:w-fit', form: { class: 'flex' }, title: 'Archive', method: :delete, data: { turbo_confirm: 'Are you sure?' }, onclick: 'event.stopPropagation()' %> <%= button_to button_title(title: nil, disabled_with: 'Arch', icon: svg_icon('archive', class: 'w-6 h-6')), submission_path(submission), class: 'btn btn-outline btn-sm w-full md:w-fit', form: { class: 'flex' }, title: 'Archive', method: :delete, data: { turbo_confirm: 'Are you sure?' }, onclick: 'event.stopPropagation()' %>
</span> </span>
@ -127,7 +127,7 @@
</download-button> </download-button>
</button> </button>
</form> </form>
<% elsif !is_submission_completed %> <% elsif !template.archived_at? && !submission.archived_at? && !is_submission_completed %>
<div class="relative flex items-center space-x-3"> <div class="relative flex items-center space-x-3">
<% if current_user.email == submitter.email %> <% if current_user.email == submitter.email %>
<form data-turbo="false" method="get" action="<%= submit_form_url(slug: submitter.slug) %>"> <form data-turbo="false" method="get" action="<%= submit_form_url(slug: submitter.slug) %>">
@ -171,7 +171,7 @@
<div class="flex-1 md:flex-none"> <div class="flex-1 md:flex-none">
<span class="btn btn-outline btn-sm w-full md:w-24">View</span> <span class="btn btn-outline btn-sm w-full md:w-24">View</span>
</div> </div>
<% unless submission.archived_at? %> <% if !submission.archived_at? && !template.archived_at? %>
<span data-tip="Archive" class="sm:tooltip tooltip-top"> <span data-tip="Archive" class="sm:tooltip tooltip-top">
<%= button_to button_title(title: nil, disabled_with: 'Arch', icon: svg_icon('archive', class: 'w-6 h-6')), submission_path(submission), class: 'btn btn-outline btn-sm w-full md:w-fit', form: { class: 'flex' }, title: 'Archive', method: :delete, data: { turbo_confirm: 'Are you sure?' }, onclick: 'event.stopPropagation()' %> <%= button_to button_title(title: nil, disabled_with: 'Arch', icon: svg_icon('archive', class: 'w-6 h-6')), submission_path(submission), class: 'btn btn-outline btn-sm w-full md:w-fit', form: { class: 'flex' }, title: 'Archive', method: :delete, data: { turbo_confirm: 'Are you sure?' }, onclick: 'event.stopPropagation()' %>
</span> </span>

@ -4,7 +4,7 @@
<h1 class="text-4xl font-semibold" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;"> <h1 class="text-4xl font-semibold" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
<% template.name.split(/(_)/).each do |item| %><%= item %><wbr><% end %> <% template.name.split(/(_)/).each do |item| %><%= item %><wbr><% end %>
<% if template.archived_at? %> <% if template.archived_at? %>
<span class="badge badge-outline badge-lg align-middle">Archived</span> <span class="ml-1 badge badge-outline badge-lg align-middle">Archived</span>
<% end %> <% end %>
</h1> </h1>
<% if @template.account_id == current_account.id %> <% if @template.account_id == current_account.id %>

@ -55,7 +55,7 @@
<% end %> <% end %>
<% if @submissions.present? %> <% if @submissions.present? %>
<div class="space-y-4"> <div class="space-y-4">
<%= render partial: 'submission', collection: @submissions %> <%= render partial: 'submission', collection: @submissions, locals: { template: @template } %>
</div> </div>
<% view_archived_html = capture do %> <% view_archived_html = capture do %>
<% if @template.submissions.where.not(archived_at: nil).exists? && !@template.archived_at? %> <% if @template.submissions.where.not(archived_at: nil).exists? && !@template.archived_at? %>

@ -19,7 +19,7 @@
</div> </div>
<% if @pagy.count > 0 %> <% if @pagy.count > 0 %>
<div class="space-y-4"> <div class="space-y-4">
<%= render partial: 'templates/submission', collection: @submissions %> <%= render partial: 'templates/submission', collection: @submissions, locals: { template: @template } %>
</div> </div>
<% elsif params[:q].present? %> <% elsif params[:q].present? %>
<div class="text-center"> <div class="text-center">

Loading…
Cancel
Save