Show audit details on request and show audit history only to requestors

yorkulibraries · Dec 17, 2024 · cbd39cf · cbd39cf
1 parent 6a63305
commit cbd39cf
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 23 deletions.
diff --git a/app/assets/javascripts/request_history.js b/app/assets/javascripts/request_history.js
@@ -1,17 +1,13 @@
 $(document).ready(function() {
-	$(".request_history table .comment").click(function() {
-		//alert($(this).parent().next().prop("class"));
-		$(this).parent().next().toggleClass('hide');
-	});
-
 
+  $(document).on("click", ".request_history table .comment", function() {
+    $(this).parent().next().toggleClass('hide');
+  });
 
   $(document).on('keyup', '[id^="note-textarea_"]', function () {
     checkCount($(this));
   });
 
-
-
 	$('#history_popup').on('shown.bs.modal', function (e) {
 
 		var data_url = $("#request_history_log").data("url");

diff --git a/app/views/requests/_history_log_modal.html.erb b/app/views/requests/_history_log_modal.html.erb
@@ -1,4 +1,4 @@
-<% if can?(:add_note, @request) %>
+
 
   <div class="modal fade" id="history_popup" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog">
@@ -11,15 +11,16 @@
 
         <div class="modal-body">
 
-          <div class="panel panel-default">
-            <div class="panel-heading">
-              Add a note
-            </div>
-            <div class="panel-body">
-              <%= render "request_history/form", locals: { remote: true} %>
+          <% if can?(:add_note, @request) %>
+            <div class="panel panel-default">
+              <div class="panel-heading">
+                Add a note
+              </div>
+              <div class="panel-body">
+                <%= render "request_history/form", locals: { remote: true} %>
+              </div>
             </div>
-          </div>
-
+          <% end %>
           <div id="request_history_log" data-url="<%= history_request_path(@request, format: "js") %>">
 
           </div>
@@ -32,4 +33,4 @@
       </div>
     </div>
   </div>
-<% end %>
+
diff --git a/app/views/requests/show.html.erb b/app/views/requests/show.html.erb
@@ -130,14 +130,15 @@
 					<% if can?(:manage, @request) %>
 						<span class="field">Assigned to</span><br/>
 						<%= @request.assigned_to ? @request.assigned_to.name : "Nobody" %>
-						<br/><br/>
-						<span class="field">History Log</span><br/>
-						<a data-toggle="modal" href="#history_popup" data-target="#history_popup" class="btn btn-xs btn-default">
-							Add a Note / History Log
-						</a>
+
 					<% else %>
 						<span class="field">Status</span><br/>
 						<%= @request.status ? @request.status.upcase : "Unknown" %>
+						<br/><br/>
+						<span class="field">Request History Log</span><br/>
+						<a data-toggle="modal" href="#history_popup" data-target="#history_popup" class="btn btn-xs btn-default">
+							View Log
+						</a>
 					<% end %>
 				</div>
 				<div class="col-md-3">

diff --git a/db/schema.rb b/db/schema.rb
@@ -185,5 +185,4 @@
     t.datetime "updated_at"
   end
 
-
 end