hyrax 3.2.0 → 3.4.1

data/app/views/hyrax/admin/analytics/work_reports/index.html.erb

@@ -0,0 +1,77 @@
+<% provide :page_title, "#{t('.title')}" %>
+
+<% provide :page_header do %>
+  <h1><span class="fa fa-bar-chart" aria-hidden="true"></span><%= t('.title') %></h1>
+<% end %>
+
+<div class="row">
+  <div class="col-sm-12">
+    <div class="work-reports">
+
+    <div class="panel panel-default">
+    <% if Hyrax.config.analytics? %>
+      <% if current_user.ability.admin? %>
+        <div class="panel-heading"><b><%= @works_count %> <%= t('.works') %></b> <%= t('.repo_summary') %> <b><%= @pageviews.all if @pageviews %> <%= t('.views') %></b> <%= t('.and') %> <b><%= @downloads.all if @downloads %> <%= t('.downloads') %></b>.</div>
+      <% else %>
+        <div class="panel-heading"><%= t('.access_to') %> <b><%= @works_count %> <%= t('.works') %></b>.</div>
+      <% end %>
+        <div class="panel-body">
+              <% if current_user.ability.admin? %>
+              <div class="row text-center">
+                <div class="nav nav-pills btn-group" role="group">
+                    <% if params[:start_date] %>
+                     <a button id='summary-btn' class="btn btn-default nav-link" type="button" href="#summary" data-toggle="pill">
+                    <% else %>
+                     <a button id='summary-btn' class="btn btn-primary nav-link" type="button" href="#summary" data-toggle="pill">
+                    <% end %>
+                        <%= t('.summary') %>
+                     </a>
+                      <a button id='monthly-btn' class="btn btn-default nav-link" type="button" href="#monthly" data-toggle="pill">
+                        <%= t('.monthly') %>
+                      </a>
+                    <% if params[:start_date] %>
+                      <a button id='range-btn' class="btn btn-primary nav-link" type="button" href="#custom-range" data-toggle="pill">
+                    <% else %>
+                      <a button id='range-btn' class="btn btn-default nav-link" type="button" href="#custom-range" data-toggle="pill">
+                    <% end %>
+                        <%= t('.custom_range') %>
+                      </a>
+                </div>
+              </div>
+              <br>
+              <div class="tab-content">
+              <% if params[:start_date] %>
+                <div class="tab-pane" id="summary">
+              <% else %>
+                <div class="tab-pane active" id="summary">
+              <% end %>
+                  <%= render "summary" %>
+                </div>
+                <div class="tab-pane" id="monthly">
+                  <%= render "monthly_summary" %>
+                </div>
+                 <% if params[:start_date] %>
+                   <div class="tab-pane active" id="custom-range">
+                <% else %>
+                  <div class="tab-pane" id="custom-range">
+                <% end %>
+                   <%= render "hyrax/admin/analytics/date_range_form", redirect_path: hyrax.admin_analytics_work_reports_path %>
+                  <%= render "custom_range" %>
+                 </div>
+              </div>
+              <% end %>
+            </div>
+          </div>
+          <p class="text-center"><%= t('.report_generated_on') %> <b><%= Time.zone.today.strftime("%B %d, %Y") %></b></p>
+
+        </div>
+
+      </div>
+      <% else %>
+        <div class="alert alert-warning" role="alert">
+          <%= t('.enable_analytics') %>
+        </div>
+     <% end %>
+    </div>
+  </div>
+</div>

data/app/views/hyrax/admin/analytics/work_reports/show.html.erb

@@ -0,0 +1,90 @@
+<% provide :page_title, "#{t('.title')}" %>
+
+<% provide :page_header do %>
+  <h1><span class="fa fa-bar-chart" aria-hidden="true"></span> <%= t('.title') %>
+  <%= link_to "#{t('.return_to_btn')}", admin_analytics_work_reports_path, class: "btn btn-primary pull-right" %>
+  </h1>
+  <br>
+<% end %>
+
+<div class="row">
+  <div class="col-sm-12">
+    <div class="work-reports">
+    
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          <div class="col-sm-10">
+            <h3><%= @document %></h3>
+          </div>
+          <div class="col-sm-2">
+            <%= link_to "#{t('.view_work_btn')}", [main_app, @document], class: "btn btn-default pull-right" %>
+          </div>
+        </div>
+        <div class="panel-body">
+          <div class="row">
+            <div class="col-xs-12 col-md-5">
+              <p><%= t('.deposited_by') %> <b><%= @document.depositor %></b> on <b><%= @document.date_uploaded.strftime("%Y-%m-%d") %></b></p>
+              <p><%= t('.work_type') %> <b><%= @document.human_readable_type %></b></p>
+              <p><%= t('.resource_type') %> <b><%= @document.resource_type.join(", ") %></b></p>
+            </div>
+            <div class="col-xs-12 col-md-5">
+              <p><%= t('.status') %> <b><%= @document.workflow_state %></b></p>
+              <p><%= t('.visibility') %> <b><%= @document.visibility %></b></p>
+            </div>
+          </div>
+        </div>
+      </div>
+          
+      <div class="row text-center">
+        <div class="nav nav-pills btn-group" role="group">
+            <% if params[:start_date] %>
+              <a button id='summary-btn' class="btn btn-default nav-link" type="button" href="#summary" data-toggle="pill">
+            <% else %>
+              <a button id='summary-btn' class="btn btn-primary nav-link" type="button" href="#summary" data-toggle="pill">
+            <% end %>
+                <%= t('.summary') %>
+              </a>
+              <a button id='monthly-btn' class="btn btn-default nav-link" type="button" href="#monthly" data-toggle="pill">
+                <%= t('.monthly') %>
+              </a>
+            <% if params[:start_date] %>
+              <a button id='range-btn' class="btn btn-primary nav-link" type="button" href="#custom-range" data-toggle="pill">
+            <% else %>
+              <a button id='range-btn' class="btn btn-default nav-link" type="button" href="#custom-range" data-toggle="pill">
+            <% end %>
+                <%= t('.custom_range') %>
+              </a>
+        </div>
+      </div>
+  <br>
+       <div class="tab-content">
+          <% if params[:start_date] %>
+            <div class="tab-pane" id="summary">
+          <% else %>
+            <div class="tab-pane active" id="summary">
+          <% end %>
+              <%= render "summary" %>
+            </div>
+
+            <div class="tab-pane" id="monthly">
+              <%= render "monthly_summary" %>
+            </div>
+            
+          <% if params[:start_date] %>
+            <div class="tab-pane active" id="custom-range">
+          <% else %>
+            <div class="tab-pane" id="custom-range">
+          <% end %>
+              <%= render "hyrax/admin/analytics/date_range_form", redirect_path: hyrax.admin_analytics_work_report_path(@document) %>
+              <%= render "custom_range" %>
+            </div>
+        </div>
+         
+          <% unless @files.nil? %>
+            <%= render "work_files" %>
+            <%= render "work_counts" %>
+         <% end %>
+         
+    </div>
+  </div>
+</div>

data/app/views/hyrax/admin/collection_types/index.html.erb

@@ -41,7 +41,7 @@
                   <button class="btn btn-danger btn-sm delete-collection-type"
                           data-collection-type="<%= collection_type.to_json %>"
                           data-collection-type-index="<%= hyrax.dashboard_collections_path({ 'f[collection_type_gid_ssim][]' => collection_type.to_global_id.to_s, 'f[has_model_ssim][]' => 'Collection' }) %>"
-                          data-has-collections="<%= collection_type.collections? %>">
+                          data-has-collections="<%= collection_type.collections.any? %>">
                     <%= t('helpers.action.delete') %>
                   </button>
                   <% end %>

data/app/views/hyrax/admin/stats/show.html.erb

@@ -4,4 +4,4 @@
     <hr />
     <%= render "top_data" %>
   </div>
-</div>
+</div>

data/app/views/hyrax/base/_form.html.erb

@@ -14,7 +14,7 @@
       <%= render 'form_visibility_error', f: f %>
     </div>
   <% end %>
-  <% if Flipflop.batch_upload? && f.object.new_record? %>
+  <% if Flipflop.batch_upload? && !f.object.persisted? %>
     <% provide :metadata_tab do %>
       <p class="switch-upload-type"><%= t('.batch_upload_hint') %> <%= link_to t('.batch_link'), hyrax.new_batch_upload_path(payload_concern: @form.model.class) %></p>
     <% end %>

data/app/views/hyrax/base/_form_child_work_relationships.html.erb

@@ -18,7 +18,7 @@ HTML Properties:
                         data: {
                           autocomplete: 'work',
                           'autocomplete-url' => Rails.application.routes.url_helpers.qa_path + '/search/find_works',
-                          'exclude-work': f.object.model.id # exclude this item from the result set.
+                          'exclude-work': f.object.model.id.to_s # exclude this item from the result set.
                         } %>
       <a href="#" onclick="return false;" class="btn btn-primary" data-behavior="add-relationship"><%= t('.add') %></a>
   </div>

data/app/views/hyrax/base/_relationships_parent_row.html.erb

@@ -12,4 +12,3 @@
       </ul>
     <% end %>
   </dd>
-

data/app/views/hyrax/base/show.html.erb

@@ -53,5 +53,11 @@
     <%# = render 'sharing_with', presenter: @presenter %>
     <%# = render 'user_activity', presenter: @presenter %>
 
+<span class='hide analytics-event' data-category="work" data-action="work-view" data-name="<%= @presenter.id %>" >
+<% @presenter.member_of_collection_ids.each do |collection_id| %>
+  <span class='hide analytics-event' data-category="work-in-collection" data-action="work-in-collection-view" data-name="<%= collection_id %>" >
+<% end %>
+
   </div>
 </div>
+

data/app/views/hyrax/collections/show.html.erb

@@ -124,3 +124,7 @@
       </div>
   <% end # if @members_count > 0 %>
 </div>
+
+
+<span class='hide analytics-event' data-category="collection" data-action="collection-page-view" data-name="<%= @presenter.id %>" >
+

data/app/views/hyrax/dashboard/_repository_growth.html.erb

@@ -1,19 +1,19 @@
 <div class="panel-heading">
   <h3 class="panel-title"><%= t('.title') %></h3>
-  <div><%= t('.subtitle') %></div>
 </div>
 <div class="panel-body text-center">
-  <% repository_growth = @presenter.repository_growth.to_json %>
-  <div id="dashboard-growth" aria-hidden="true" style="height: 200px"><script>
+  <div id="dashboard-growth" aria-hidden="true" style="height: 200px">
+  <% repository_growth = @presenter.repository_growth(@start_date.to_datetime, @end_date.to_datetime).to_json %>
+  <script>
 //<![CDATA[
 Hyrax.statistics.repositoryGrowth = <%== repository_growth %>
 //]]>
 </script></div>
-  <table aria-label="<%= t('.title') %>, <%= t('.subtitle') %>" class="table table-striped sr-only text-left">
+  <table aria-label="<%= t('.title') %>" class="table table-striped sr-only text-left">
     <thead>
       <tr>
         <th><%= t('.date') %></th>
-        <th><%= t('.objects') %></th>
+        <th><%= t('.works') %></th>
         <th><%= t('.collections') %></th>
       </tr>
     </thead>

data/app/views/hyrax/dashboard/_resource_type_graph.html.erb

@@ -0,0 +1,41 @@
+<div class="panel panel-default">
+  <div class="panel-heading">
+    <h3 class="panel-title"><%= t('.title') %></h3>
+  </div>
+  <div class="panel-body">
+    <div id="dashboard-resource-types" aria-hidden="true" style="height: 200px">
+      <% @resource_types = Hyrax::Statistic.resource_types %>
+      <script>
+        Morris.Donut({
+            element: 'dashboard-resource-types',
+            data: [
+              <% @resource_types.each do |row| %>
+                { label: "<%= row[0] %>", value: <%= row[1].to_i %> },
+              <% end %>
+            ],  
+            colors: ['#001219','#005f73','#0a9396','#94d2bd','#e9d8a6','#ee9b00','#ca6702','#bb3e03','#ae2012','#9b2226'],
+            gridTextSize: '12px',
+            resize: true
+          });
+      </script>
+    </div>
+                      
+    <table aria-label="<%= t('.title') %>" class="table table-striped sr-only text-left">
+      <thead>
+        <tr>
+          <th><%= t('.resource_type') %></th>
+          <th><%= t('.count') %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @resource_types.each do |row| %>
+          <tr>
+            <td><%= row[0] %></td>
+            <td><%= row[1] %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>
+

data/app/views/hyrax/dashboard/_sidebar.html.erb

@@ -12,7 +12,10 @@
         </div>
       </div>
     </li>
-
+    <li><%= link_to hyrax.dashboard_path do %>
+          <span class="fa fa-home" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.dashboard') %></span>
+        <% end %>
+    </li>
     <%= render 'hyrax/dashboard/sidebar/activity', menu: menu %>
     <%= render 'hyrax/dashboard/sidebar/repository_content', menu: menu %>
     <%= render 'hyrax/dashboard/sidebar/tasks', menu: menu %>

data/app/views/hyrax/dashboard/_tabs.html.erb

@@ -0,0 +1,11 @@
+<!-- Nav tabs -->
+<ul class="nav nav-tabs" role="tablist">
+  <li role="presentation" class="active"><a href="#admin_sets" aria-selected="true" role="tab" data-toggle="tab"><%= t('.admin_sets') %></a></li>
+</ul>
+
+<!-- Tab panes -->
+<div class="tab-content">
+  <div role="tabpanel" class="tab-pane active" id="admin_sets">
+    <%= render 'admin_sets' %>
+  </div>
+</div>

data/app/views/hyrax/dashboard/_user_activity.html.erb

@@ -1,28 +1,22 @@
 <div class="panel-heading">
   <h3 class="panel-title"><%= t('.title') %></h3>
-  <div><%= t('.subtitle') %></div>
 </div>
 <div class="panel-body text-center">
-  <% user_activity = @presenter.user_activity.to_json %>
-  <div id="user-activity" aria-hidden="true" style="height: 200px"><script>
-//<![CDATA[
-Hyrax.statistics.userActivity = <%== user_activity %>
-//]]>
-</script></div>
-  <table aria-label="<%= t('.title') %>, <%= t('.subtitle') %>" class="table table-striped sr-only text-left">
-    <thead>
-      <tr>
-        <th><%= t('.date') %></th>
-        <th><%= t('.new_users') %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% JSON.parse(user_activity).each do |row| %>
-        <tr>
-          <td><%= row["y"] %></td>
-          <td><%= row["a"] %></td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
+  <% if Hyrax.config.analytics? %>
+    <%= render 'user_activity_graph' %>
+
+    <div class="col-md-3">
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          <h2 class="panel-title text-center"><%= t('.user_summary') %></h2>
+        </div>
+        <div class="panel-body text-center">
+          <p><%= t('.registered_users') %>: <%= @presenter.user_count(@start_date.to_date, @end_date.to_date) %></p>
+          <p><%= t('.new_visitors') %>: <%= Hyrax::Analytics.new_visitors('range', "#{@start_date},#{@end_date}") %></p>
+          <p><%= t('.returning_visitors') %>: <%= Hyrax::Analytics.returning_visitors('range', "#{@start_date},#{@end_date}") %></p>
+          <p><%= t('.total_visitors') %>: <%= Hyrax::Analytics.total_visitors('range', "#{@start_date},#{@end_date}") %></p>
+        </div>
+      </div>
+    </div>
+  <% end %>
 </div>

data/app/views/hyrax/dashboard/_user_activity_graph.html.erb

@@ -0,0 +1,55 @@
+<div id="user-activity" class="col-md-9" aria-hidden="true" style="height: 200px">
+  <% users = Hyrax::Admin::UserActivityPresenter.new(@start_date.to_date,@end_date.to_date).as_json %>
+  <% return_visits = Hyrax::Analytics.returning_visits_by_day("#{@start_date},#{@end_date}").list.reverse %>
+  <% new_visits = Hyrax::Analytics.new_visits_by_day("#{@start_date},#{@end_date}").list.reverse %>
+  <script>
+    //Draws a bar chart of new user signups, and visitors from analytics
+    Morris.Bar({
+        element: 'user-activity',
+        data: [
+          <% users.zip(return_visits, new_visits).each do |e| %>
+            <% unless e[1].nil? or e[2].nil? %>
+              { date: "<%= e[0][0] %>", users: <%= e[0][1] %>, return_visits: <%= e[1][1] %>, new_visits: <%= e[2][1] %>, total_visits: <%= e[1][1] + e[2][1] %>},
+            <% end %>
+          <% end %>
+        ],
+        xkey: 'date',
+        ykeys: ['total_visits', 'new_visits', 'return_visits', 'users'],
+        labels: ['<%= t('.total_visits') %>', '<%= t('.new_visits') %>', '<%= t('.return_visits') %>', '<%= t('.new_users') %>'],
+        barColors: [
+            '#005f73','#0a9396','#94d2bd','#e9d8a6',
+            '#ee9b00','#ca6702','#bb3e03','#ae2012','#9b2226'
+        ],
+        gridTextSize: '12px',
+        hideHover: true,
+        resize: true,
+        gridLineColor: '#E5E5E5',
+        stacked: true
+    });
+  </script>
+</div>
+
+<table aria-label="User Activity" class="table table-striped sr-only text-left">
+  <thead>
+    <tr>
+      <th><%= t('.date') %></th>
+      <th><%= t('.total_visits') %></th>
+      <th><%= t('.new_visits') %></th>
+      <th><%= t('.return_visits') %></th>
+      <th><%= t('.new_users') %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% users.zip(return_visits, new_visits).each do |e| %>
+      <% unless e[1].nil? or e[2].nil? %>
+      <tr>
+        <td><%= e[0][0] %></td>
+        <td><%= e[1][1] + e[2][1] %></td>
+        <td><%= e[2][1] %></td>
+        <td><%= e[1][1] %></td>
+        <td><%= e[0][1] %></td>
+      </tr>
+      <% end %>
+    <% end %>
+  </tbody>
+</table>

data/app/views/hyrax/dashboard/_visibility_graph.html.erb

@@ -0,0 +1,31 @@
+<div class="panel panel-default">
+  <div class="panel-heading">
+    <h3 class="panel-title"><%= t('.visibility') %></h3>
+  </div>
+  <div class="panel-body">
+      <% repository_objects = @presenter.repository_objects.to_json %>
+      <div id="dashboard-repository-objects" aria-hidden="true" style="height: 200px">
+      <script>
+        //<![CDATA[
+        Hyrax.statistics.repositoryObjects = <%== repository_objects %>
+        //]]>
+      </script>
+      </div>
+      <table class="table table-striped sr-only text-left">
+        <thead>
+          <tr>
+            <th></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% JSON.parse(repository_objects).each do |row| %>
+            <tr>
+              <td><%= row["label"] %></td>
+              <td><%= row["value"] %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+  </div>
+</div>

data/app/views/hyrax/dashboard/_work_type_graph.html.erb

@@ -0,0 +1,41 @@
+<div class="panel panel-default">
+  <div class="panel-heading">
+    <h3 class="panel-title"><%= t('.title') %></h3>
+  </div>
+  <div class="panel-body">
+    <div id="dashboard-work-types" aria-hidden="true" style="height: 200px">
+      <% @work_types = Hyrax::Statistic.work_types %>
+      <script>
+        Morris.Donut({
+            element: 'dashboard-work-types',
+            data: [
+              <% @work_types.each do |row| %>
+                { label: "<%= row[0] %>", value: <%= row[1].to_i %> },
+              <% end %>
+            ],  
+            colors: ['#001219','#005f73','#0a9396','#94d2bd','#e9d8a6','#ee9b00','#ca6702','#bb3e03','#ae2012','#9b2226'],
+            gridTextSize: '12px',
+            resize: true
+          });
+      </script>
+    </div>
+                            
+    <table aria-label="<%= t('.title') %>" class="table table-striped sr-only text-left">
+      <thead>
+        <tr>
+          <th><%= t('.work_type') %></th>
+          <th><%= t('.count') %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @work_types.each do |row| %>
+          <tr>
+            <td><%= row[0] %></td>
+            <td><%= row[1] %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+
+  </div>
+</div>

data/app/views/hyrax/dashboard/collections/_default_group.html.erb

@@ -16,9 +16,9 @@
       <th><%= t("hyrax.dashboard.my.heading.access") %></th>
     <% end %>
     <th><%= t("hyrax.dashboard.my.heading.type") %></th>
-    <th><%= t("hyrax.dashboard.my.heading.collection.visibility") %></th>
-    <th><%= t("hyrax.dashboard.my.heading.items") %></th>
     <th><%= t("hyrax.dashboard.my.heading.last_modified") %></th>
+    <th><%= t("hyrax.dashboard.my.heading.items") %></th>
+    <th><%= t("hyrax.dashboard.my.heading.collection.visibility") %></th>
     <th><%= t("hyrax.dashboard.my.heading.action") %></th>
   </tr>
   </thead>

data/app/views/hyrax/dashboard/collections/_form.html.erb

@@ -34,7 +34,8 @@
                 <%= render_edit_field_partial(term, f: f) %>
               <% end %>
 
-              <% if f.object.persisted? %>
+              <% # TODO: Remove check for PcdmCollection when Issue #5286 is resolved. %>
+              <% if f.object.persisted? && Hyrax.config.collection_class != Hyrax::PcdmCollection %>
                 <%# we're loading these values dynamically to speed page load %>
                 <%= f.input :thumbnail_id,
                     input_html: { data: { text: thumbnail_label_for(object: f.object) } } %>
@@ -71,29 +72,35 @@
       </div> <!-- end description -->
 
       <% if @form.persisted? %>
-        <div id="branding" class="tab-pane">
-          <div class="panel panel-default labels">
-            <div class="panel-body">
-              <%= render 'form_branding', f: f %>
+        <% if collection_brandable?(collection: @collection) %>
+          <div id="branding" class="tab-pane">
+            <div class="panel panel-default labels">
+              <div class="panel-body">
+                <%= render 'form_branding', f: f %>
+              </div>
             </div>
           </div>
-        </div>
+        <% end %>
 
-        <div id="discovery" class="tab-pane">
-          <div class="panel panel-default labels">
-            <div class="panel-body">
-              <%= render 'form_discovery', f: f %>
+        <% if collection_discoverable?(collection: @collection) %>
+          <div id="discovery" class="tab-pane">
+            <div class="panel panel-default labels">
+              <div class="panel-body">
+                <%= render 'form_discovery', f: f %>
+              </div>
             </div>
           </div>
-        </div>
+        <% end %>
 
-        <div id="sharing" class="tab-pane">
-          <div class="panel panel-default labels" id="collection_permissions" data-param-key="<%= f.object.model_name.param_key %>">
-            <div class="panel-body">
-              <%= render 'form_share', f: f %>
+        <% if collection_sharable?(collection: @collection) %>
+          <div id="sharing" class="tab-pane">
+            <div class="panel panel-default labels" id="collection_permissions" data-param-key="<%= f.object.model_name.param_key %>">
+              <div class="panel-body">
+                <%= render 'form_share', f: f %>
+              </div>
             </div>
           </div>
-        </div>
+        <% end %>
       <% end %>
 
       <div class="panel-footer">

data/app/views/hyrax/dashboard/collections/_form_discovery.html.erb

@@ -5,13 +5,16 @@
 
   <div class="form-group">
     <label class="radio">
-      <input type="radio" id="visibility_open" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>" <% if @collection.open_access? %> checked="true"<% end %> /><strong><%= t('hyrax.visibility.open.text') %></strong> - <%= t('hyrax.visibility.open.note_html') %>
+      <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>
+      <strong><%= t('hyrax.visibility.open.text') %></strong> - <%= t('hyrax.visibility.open.note_html') %>
     </label>
     <label class="radio">
-      <input type="radio" id="visibility_registered" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>" <% if @collection.authenticated_only_access? %> checked="true"<% end %> /><strong><%= t('hyrax.visibility.authenticated.text', institution: institution_name) %></strong> - <%= t('hyrax.visibility.authenticated.note_html', institution: institution_name) %>
+      <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>
+      <strong><%= t('hyrax.visibility.authenticated.text', institution: institution_name) %></strong> - <%= t('hyrax.visibility.authenticated.note_html', institution: institution_name) %>
     </label>
     <label class="radio">
-      <input type="radio" id="visibility_restricted" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE %>" <% if @collection.private_access? %> checked="true"<% end %> /><strong><%= t('hyrax.visibility.restricted.text') %></strong>- <%= t('hyrax.visibility.restricted.note_html') %>
+      <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE %>
+      <strong><%= t('hyrax.visibility.restricted.text') %></strong>- <%= t('hyrax.visibility.restricted.note_html') %>
     </label>
   </div>
 

data/app/views/hyrax/dashboard/collections/_form_share.html.erb

@@ -8,7 +8,7 @@
 
       <!-- Add group form -->
       <div class="form-add-sharing-wrapper" data-id="<%= @form.id %>">
-        <%= simple_form_for @form.permission_template,
+        <%= simple_form_for collection_permission_template_form_for(form: @form),
                             url: [hyrax, :dashboard, @form, :permission_template],
                             html: { id: 'group-participants-form' } do |f| %>
 
@@ -40,7 +40,7 @@
 
       <!-- Add user form -->
       <div class="form-add-sharing-wrapper" data-id="<%= @form.id %>">
-        <%= simple_form_for @form.permission_template,
+        <%= simple_form_for collection_permission_template_form_for(form: @form),
                             url: [hyrax, :dashboard, @form, :permission_template],
                             html: { id: 'user-participants-form' } do |f| %>