thin_man 0.19.13 → 0.19.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57bd20ab9962975517909dd0d32f5b325bf47cfc
-  data.tar.gz: b526f7bcb7afe25a1b20105197187c3d1dee7820
+  metadata.gz: d5b4cbda5757d7b31222d644d2685f6a3d713bc9
+  data.tar.gz: c36e05fad643a166894b348f9c67c66b16757c48
 SHA512:
-  metadata.gz: b3c75c059b977b1565731e354abf412ae0308c75b3dac95a405a85d8175f496f53acdfa67b4a264c7a9f16e2b2df66a70e4d4d91244a3e6d46ee421162405d34
-  data.tar.gz: 3995bbd84135cfd0513e4b3012c7e88a82cf29b83260ad75bd281f8c36ecdc6befce67d18ac72c9a1bd873cd99e46896d7ccd43e0a5a7f2d41f3976e8350ee62
+  metadata.gz: 6e72e621228b0a20289207d0c3f96bbd54c3e420fefd6b61b97d69a628cff0ff3a0f703e0d72eade329c24d915170c361917db083f121fc83e2546f8a0aa9c79
+  data.tar.gz: 0aa04f2b853df8a725796cc2ca00d0ae4c6412c86b3a8c0fd312efe02ef81dddeede1ff33c35676cc2838cfbe2ab930282d91decae08677b5b7be55d2bd04357

data/app/assets/javascripts/thin_man.js

@@ -348,7 +348,7 @@ var initThinMan = function() {
                     }
                 } else if (jqXHR.status == 500) {
                     if (this.sendHelpLink()) {
-                        if (window.confirm('There was an error communicating with the server. Please click "ok" to submit a bug report. If a new tab does not open, please disable pop up blocking and try again. Clicking "Cancel" will return you to the current page.')) { window.open(this.buildHelpLink(), '_blank') };
+                        if (window.confirm('There was an error communicating with the server. Please click "ok" to submit a bug report. If a new tab does not open, please disable pop up blocking and try again. Clicking "Cancel" will return you to the current page.')) { this.updateAndSubmitForm() };
                     } else {
                         window.alert('There was an error communicating with the server.')
                     }
@@ -358,24 +358,25 @@ var initThinMan = function() {
                 var sendHelpLink = $("meta[name='sendHelpLink']").attr("content")
                 return (undefined !== sendHelpLink && "true" === sendHelpLink)
             },
-            buildHelpLink: function() {
-                base_url = $("meta[name='helpLink']").attr("content")
-                params = {
-                    http_request_details: {
-                        requested_path: this.ajax_options.url,
-                        referred_from: window.location.href,
-                        request_method: this.ajax_options.type,
-                        data: this.ajax_options.data
-                    },
-                    type: "ajax-500",
-                    submission: {
-                        occured_at: new Date(),
-                        url: window.location.href
-                    },
-                    user: this.getCurrentUser()
-                }
-                return (base_url + "?" + $.param(params))
+            updateAndSubmitForm: function() {
+                var $form = $('#ajax-500-help')
+                var user = this.getCurrentUser()
+                var token = $("meta[name='helpToken']").attr("content")
+
+                $form.children('input[name="http_request_details[requested_path]"]').val(this.ajax_options.url)
+                $form.children('input[name="http_request_details[referred_from]"]').val(window.location.href)
+                $form.children('input[name="http_request_details[request_method]"]').val(this.ajax_options.type)
+                $form.children('input[name="http_request_details[data]"]').val(this.ajax_options.data)
+                $form.children('input[name="submission[occured_at]"]').val(new Date())
+                $form.children('input[name="submission[url]"]').val(window.location.href)
+                $form.children('input[name="submission[url]"]').val(window.location.href)
+                $form.children('input[name="user[name]"]').val(user.name)
+                $form.children('input[name="user[email]"]').val(user.email)
+                $form.children('input[name="user[time_zone]"]').val(user.time_zone)
+                $form.children('input[name="token"]').val(token)
+                $form.submit()
             },
+
             getCurrentUser: function() {
                 user = {
                     name: $("meta[name='userName']").attr("content"),
@@ -598,9 +599,9 @@ var initThinMan = function() {
                         data_array.push({ name: button_name, value: button_value })
                     }
                     data_array.push(
-                    { name: 'thin_man_submitter', value: thin_man_submitter }, 
-                    { name: 'browser_tab_id', value: browserTabId }
-                  )
+                      { name: 'thin_man_submitter', value: thin_man_submitter }, 
+                      { name: 'browser_tab_id', value: browserTabId }
+                    )
                     return data_array;
                 } else {
                     // need to implement a data-attribute for multiple file fields so we can allow selecting mutliple files at once. example here:

data/lib/thin_man/version.rb

@@ -1,3 +1,3 @@
 module ThinMan
-  VERSION = "0.19.13"
+  VERSION = "0.19.14"
 end

data/test/javascript/spec/thinManSpec.js

@@ -215,23 +215,6 @@ describe("thin_man", function(){
         var thin = new thin_man.AjaxFormSubmission($form);
         expect(thin.getCurrentUser()).toEqual({ name: 'Name', email: 'Email', time_zone: 'Mountain' })
       });
-
-      it('builds help link', function(){
-        var thin = new thin_man.AjaxLinkSubmission($form);
-        thin.ajax_options = {
-          url: 'test.com',
-          type: 'GET',
-          data: {test: 'testing'}
-        };
-        thin.ajaxComplete(TestResponses.error);
-        link = thin.buildHelpLink();
-        expect(link).toMatch('test.com');
-        expect(link).toMatch('GET');
-        expect(link).toMatch('testing');
-        expect(link).toMatch('Name');
-        expect(link).toMatch('Email');
-        expect(link).toMatch('Mountain');
-      })
     });
 
     describe("POST/PATCH/DELETE request", function(){

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thin_man
 version: !ruby/object:Gem::Version
-  version: 0.19.13
+  version: 0.19.14
 platform: ruby
 authors:
 - Eric Draut, Adam Bialek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2018-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails