drg_resources_plugin 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dded601b12b36c4c6e51e849f6df0182a798647bac3c4b10e1de925620019100
-  data.tar.gz: 95a5955a9b54431544927406790c0f03651725515b43a43ca8c75d6064e6f51e
+  metadata.gz: 5926d489193b040feaa9fc2401ca383b05c0d63e353722342d89db80e948cb4e
+  data.tar.gz: 9efece4df8836e08499336c490c73e037eb3e9d226d0cc48fd01e6ffb71eb635
 SHA512:
-  metadata.gz: 7fc9d2777264428dc007a2375ab2b1fab63bfa717a935ea0ffce528cb2ae0217a139c3bfa7a42c93309ca593ab5316466a96139dbeb2cac298a9afc4c2c1594b
-  data.tar.gz: 4487e2a5d3b94cbe22ad8e1e5e845112f46c0f077725ca29928c04d464c5fb7f07b5e4c6b6602498a813c0afec624606750fa11e7a1bb7083fa340da5d498469
+  metadata.gz: 386dddaa6c540a02b3d149eee86395b8f03df54c56194be18cdcff32e190711ade5d6e0e379da7804d566f72dd31640b615e7fb5574b293de196fd05584472f9
+  data.tar.gz: c66839ff3b79f04aa273ac2232961fa215ec4ee37ab51164fdfe2e9ee2f9fe30dc5712aae691b4f8ffe32492a523145db7180b5ed1aa5e3aff508958ac4c430a

data/app/assets/javascripts/resources.js

@@ -38,15 +38,11 @@ $('#category').bind('change', function() {
 });
 
   /*******************************************************************
-  * Popup CMS edit menu option clicked
+  * Resources: View or delete resource resetvation.
   *******************************************************************/
-  $('.resources-table .usage div').on('click',function(e) {
-    var url = e.target.getAttribute("data-url");
-//    $('#iframe_edit').attr('src', url);  
-    $('#iframe_edit').bPopup({
-      content:'iframe', //'ajax', 'iframe' or 'image'
-      contentContainer: '.content',
-      loadUrl: url
-    });
+  $('.resource-usage').on('click',function(e) {
+    var url = $(this).data('url');
+    $('#iframe_edit').attr('src', url);
+  
   });
 });

data/app/helpers/resources_helper.rb

@@ -36,7 +36,7 @@ def render_usages(resource_usages, date)
       next if time1 == time2
 # url for displaying detail data      
       url   = "/cms/#{usage.id}/edit?form_name=resource_usage_show&table=resource_usage"
-      html << %Q[<div title="Click to view" data-url="#{url}"><b>#{time1} - #{time2}</b><br>#{usage.description}</div>]
+      html << %Q[<div class="resource-usage" title="Click to view" data-url="#{url}"><b>#{time1} - #{time2}</b><br>#{usage.description}</div>]
     end
   end
   html.html_safe

data/app/views/resources/_menu.html.erb

@@ -18,7 +18,9 @@
 <%= javascript_tag(date_picker.js) %>
 <hr class='hr-separator'>
 
-<% # = dc_iframe_edit(nil) %>
-<div id='iframe_edit' name='iframe_edit'>
+<%= dc_iframe_edit(nil) %>
 <div class="content"></div>
-</div>
+<!--
+<div id="iframe_edit" name="iframe_edit"></div>
+<div class="content"></div>
+-->

data/lib/drg_resources_plugin/version.rb

@@ -1,3 +1,3 @@
 module DrgResourcesPlugin
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_resources_plugin
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-22 00:00:00.000000000 Z
+date: 2019-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails