sinatra-hexacta 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e27f66144b0ee4048817d8c92a6fc993ab63ca176a79ac1feb9288175e93103
-  data.tar.gz: 5abf03f218822c22896a9200c05912afed6994e2b3b9fc872dcad45a8cb32072
+  metadata.gz: 4a9dc56be12a60357e82d8279807d2553afc0ad376e430bcfbdf18efc49b74ca
+  data.tar.gz: 2bb9c311849b822ccbc6f36a92c3d989bf36a8a851df97793d01e91d7cafab67
 SHA512:
-  metadata.gz: a4738793bb01253652be89cb9b8462c96663c9d4ffcfdd161cccd7fa6fa07437d48e2fb90ce82a74fa08548d878c0f827fcc31d515bcfa80421564645fce43a8
-  data.tar.gz: a9931739f2585cc09789a9a116f75b2303d967c9e2d73350386d79f5c9b71f073d4000bfb863ed80380be61564d0a5eaabbe59de9fa8a24ced6a140980d084cb
+  metadata.gz: 2d2d8812917f8d26437c9b461b7fe59ae7685922075e2cb29be86d7f3b684c5894c563162a86d915898d97075e861956acc9af8b43a3d17c1a240f401789dec0
+  data.tar.gz: c99a0226bf62c3b1408e4936197b3570e39ea5596a4b53b1fc3184fb519ce4a02397bc52c89eba104d1fabfc090158fe608ba46df5da479095a0e0dbecc05ee8

data/lib/sinatra/handlers/errors.rb

@@ -23,7 +23,7 @@ module Sinatra
       ErrorHandler.copy_file("/lib/sinatra/views/errors/#{template_code}.slim","/app/views/#{Hexacta::GEM_FILE_DIR}/errors/#{template_code}.slim")
       error code do
         if code == 500
-          title = env['sinatra.error'].message.split(':')[0].gsub('#<','');
+          title = env['sinatra.error'].message
           message = (["in #{request.url}"] + env['sinatra.error'].backtrace).join(',');
           NotificationSender.instance.send_error(authenticated(User),title,message)
         end

data/lib/sinatra/helpers/cas.rb

@@ -82,7 +82,7 @@ module Sinatra
       if logged_in?(request, session)
         url = CAS_CLIENT.logout_url()
         session.clear
-        str = request.referer
+        str = request.referer || ''
         comeback = "=" + (str.include?("?")? str.slice(0..(str.index('?')-1)) : str) #Hack mal!
         redirect url + (url.include?("?service")? "" : "?service") + comeback
       end

data/lib/sinatra/public/js/app.js

@@ -20,10 +20,28 @@ $(document).ready(function(){
       Waves.attach('.btn-icon, .btn-float', ['waves-circle', 'waves-float']);
       Waves.init();
     })();
+    update_html_elements();
 });
 
 function update_html_elements() {
 
+    $("form.async").submit(function(e){
+      e.preventDefault();
+      var datastring = $(this).serialize();
+      var url = $(this).attr('action');
+      $(this).closest('.modal').modal('hide');
+      $('body').append('<div aria-labelledby="loading" class="modal bounceIn animated" id="loading-modal" role="dialog" tabindex="-1" data-backdrop="static" data-keyboard="false"><div class="modal-dialog modal-sm" style="width:150px !Important;"><div class="modal-content"><div class="modal-body p-20 text-center"><div class="preloader pl-lg"><svg class="pl-circular" viewBox="25 25 50 50"><circle class="plc-path" cx="50" cy="50" r="20"></circle></svg></div></div><div class="modal-footer" style="text-align: center !Important;"><div class="btn btn-link waves-effect c-gray">Espere...</div></div></div></div></div>');
+      $('#loading-modal').modal('show');
+      $.ajax({
+        type: "POST",
+        url: url,
+        data: datastring,
+        success: function(data) {
+          location.reload();
+        }
+      });
+    });
+
     // Fix modal inside other components
     $('.modal').appendTo("body");
 
@@ -537,76 +555,20 @@ $( document ).ajaxStop(function() {
   stop_load();
 });
 
-function rm(url) {
-  disableButtons();
-  if (confirm('¿Estás seguro que deseas realizar esta operación?')) {
-    $.ajax({
-        url: url,
-        type: 'DELETE',
-        done: function(result) {
-          location.reload();
-        },
-        success: function(result) {
-          location.reload();
-        },
-        error: function(error) {
-          alert("Ha ocurrido un error, intentalo nuevamente!");
-          enableButtons();
-        }
-    });
-  } else {
-    enableButtons();
-  }
-}
-
 
 function rm_object(object,id) {
-  disableButtons();
+  $(".modal").modal('hide');
+  $('body').append('<div aria-labelledby="loading" class="modal bounceIn animated" id="loading-modal" role="dialog" tabindex="-1" data-backdrop="static" data-keyboard="false"><div class="modal-dialog modal-sm" style="width:150px !Important;"><div class="modal-content"><div class="modal-body p-20 text-center"><div class="preloader pl-lg"><svg class="pl-circular" viewBox="25 25 50 50"><circle class="plc-path" cx="50" cy="50" r="20"></circle></svg></div></div><div class="modal-footer" style="text-align: center !Important;"><div class="btn btn-link waves-effect c-gray">Espere...</div></div></div></div></div>');
+  $('#loading-modal').modal('show');
   $.ajax({
     url: '/' + object + '/' + id,
     type: 'DELETE',
-    data: {},
     success: function(result) {
       location.reload();
     }
   });
 }
 
-function post(url) {
-  disableButtons();
-  if (confirm('¿Estás seguro que deseas realizar esta operación?')) {
-    $.ajax({
-        url: url,
-        type: 'POST',
-        done: function(result) {
-          location.reload();
-        },
-        success: function(result) {
-          location.reload();
-        },
-        error: function(error) {
-          alert("Ha ocurrido un error, intentalo nuevamente!");
-          enableButtons();
-        }
-    });
-  } else {
-    enableButtons();
-  }
-}
-
-function disableButtons() {
-  $(".btn").each(function() {
-    $(this).data("temp",$(this).val());
-    $(this).attr("disabled",true);
-  });
-  return true
-}
-function enableButtons() {
-  $(".btn").each(function() {
-    $(this).attr("disabled",false);
-  });
-  return true
-}
 (function( $ ){
    $.fn.disableSelect = function() {
       $(this).prop("disabled", true);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Marco Zanger