sinatra-hexacta 1.5.1 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0bc5b02f5e6b461318773afa357ab6f22a90123c5253a90077575d90c5a639a
-  data.tar.gz: fb57adaf1d49b6b744504b7e25e7708c98cf11e5f8baee8c0bd32f8d2872e240
+  metadata.gz: d569497a337ad41584b964887b5685c72128e51e20f197444f646ca54e958328
+  data.tar.gz: 496c85e904b87af77d78edf0ba9e6e24a86797dc9593657761691310d97e57cc
 SHA512:
-  metadata.gz: 2820db09ad01271011903d10a37ac905a4a5739e300bd6a28d6385352300f99d59f99bacae9fe5070000e15f73d9c6f88908f36503b49aa27ffea4f642f85caf
-  data.tar.gz: 21f7bc48f1a05a019e1c84ff9900f035290d9a4e2d60d41e9e2a1ca2c6770a28ff2c972322b3bc849d6d20f5c8ec3f7024771850f2652018113c6428a3cff8fc
+  metadata.gz: 72d273962da241e92ae5d0a8a1b28035cd5d62211642cf6bef33a406e1bbd0138b2aabe04fce47d1f5f4ecfb268acbba15e1763c1e29040a7e58da4420f0f449
+  data.tar.gz: a4325f140e4de501a18ed7406eae8855b2aac2d8279e436b1dd36b809651f2f762ed74569b636e80c9e593ec29c6a26ffa3b592bac0c3cf4d10e19b5eca7d0e7

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

@@ -25,6 +25,35 @@ $(document).ready(function(){
 
 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) {
+          $('#loading-modal').modal('hide');
+          $('#loading-modal').remove();
+          $('body').append('<div aria-labelledby="ok" class="modal bounceIn animated" id="ok-modal" role="dialog" tabindex="-1"><div class="modal-dialog modal-sm" style="width:150px !Important;"><div class="modal-content"><div class="modal-body p-20 text-center"><i class="zmdi zmdi-hc-3x zmdi-check-circle c-green"></i></div><div class="modal-footer" style="text-align: center !Important;"><div class="btn btn-link waves-effect c-gray">¡Listo!</div></div></div></div></div>');
+          $('#ok-modal').modal('show');
+          setTimeout(function () {
+            location.reload();
+          }, 1000)
+        },
+        error: function(data) {
+          $('#loading-modal').modal('hide');
+          $('#loading-modal').remove();
+          $('body').append('<div aria-labelledby="error" class="modal bounceIn animated" id="error-modal" role="dialog" tabindex="-1"><div class="modal-dialog modal-sm" style="width:150px !Important;"><div class="modal-content"><div class="modal-body p-20 text-center"><i class="zmdi zmdi-hc-3x zmdi-alert-polygon c-red"></i></div><div class="modal-footer" style="text-align: center !Important;"><div class="btn btn-link waves-effect c-gray">Oops...</div></div></div></div></div>');
+          $('#error-modal').modal('show');
+        }
+      });
+    });
+
     // Fix modal inside other components
     $('.modal').appendTo("body");
 
@@ -538,76 +567,32 @@ $( 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();
+    success: function(data) {
+      $('#loading-modal').modal('hide');
+      $('#loading-modal').remove();
+      $('body').append('<div aria-labelledby="ok" class="modal bounceIn animated" id="ok-modal" role="dialog" tabindex="-1"><div class="modal-dialog modal-sm" style="width:150px !Important;"><div class="modal-content"><div class="modal-body p-20 text-center"><i class="zmdi zmdi-hc-3x zmdi-check-circle c-green"></i></div><div class="modal-footer" style="text-align: center !Important;"><div class="btn btn-link waves-effect c-gray">¡Listo!</div></div></div></div></div>');
+      $('#ok-modal').modal('show');
+      setTimeout(function () {
+        location.reload();
+      }, 1000)
+    },
+    error: function(data) {
+      $('#loading-modal').modal('hide');
+      $('#loading-modal').remove();
+      $('body').append('<div aria-labelledby="error" class="modal bounceIn animated" id="error-modal" role="dialog" tabindex="-1"><div class="modal-dialog modal-sm" style="width:150px !Important;"><div class="modal-content"><div class="modal-body p-20 text-center"><i class="zmdi zmdi-hc-3x zmdi-alert-polygon c-red"></i></div><div class="modal-footer" style="text-align: center !Important;"><div class="btn btn-link waves-effect c-gray">Oops...</div></div></div></div></div>');
+      $('#error-modal').modal('show');
     }
   });
 }
 
-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.1
+  version: 1.6.1
 platform: ruby
 authors:
 - Marco Zanger