rbbt-rest 1.2.10 → 1.2.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWZjZTVhNWJlODk4NjM1NzQ3NDljMmE2NjVkYTc3NzMyYWRkODU0Yg==
+    YWIyOTNiMGRjOGUwMGVmMWNlYjFjNjIwMWJmYTA0YzE2MzdlOWYxNQ==
   data.tar.gz: !binary |-
-    ZmMzOTlkNTEzNjYwZjA2NzE3NWViMjljNjA5ZWVmMTE4NDQxOGYwYw==
+    MTc2NDdkMGJiNWUxNGQ3MjkxY2VhMjgzMWY5OGNjZTEwZWEzMzc2Zg==
 SHA512:
   metadata.gz: !binary |-
-    NzA0MWIwNWM2MWYzMjFmYjRkMzk2YTY3MDIzMGMxMjlmNDE0ZGRjOWI5MWNl
-    MzMwZWVlZjA0YzA5NDI3OGE4N2RmNGZjZDk0NGZiMzhmN2M3ZGM4NmZkYjhh
-    NzU0MTY2NTdjZGJkNTVjNTgxM2Y2NTA1NTE2OWI5YTkxYjdkOTk=
+    NjUwMjY0NTJkYzc1YmQzOTg1ZmY0ZWRkMjRmZDYzMzI5OGZhM2RmMzNlMTli
+    YmQ2OGExNTQ0YjhjMWM0MzA0ZjA0YWVkZjdlMTMwYzY2MzQzZWY2OWZkZTFh
+    M2FkZDI0N2RmNjlmZDc0ZmI1ZWMwNGYwNDRhZmVmZmY4MWI3MmI=
   data.tar.gz: !binary |-
-    MmFhMzRlYTRkNjcyN2Q0ZjBjMmYzZTg3NmRkNDdhYjBhZTNmZmFkZjdjNWI3
-    Mzk3ODZjN2ExMTU5NGRjNzQ4ZTFjNDczNzdmNjllOTVmOWU3Y2UyYWQxNGZm
-    NjEwMjQ1YWIwODA4MGVlNzFiNWU0YzdlOWQ2NzU2NGE1MWUyN2M=
+    ZGM0MGE2YmU5YmExZjZkNzhlYTQyODk3MWFiZGQwZWFmMGMyOWVjZTgxMTY0
+    NzAwYTYyNmNkZTY3MWUyNGExNzRhYTJkYmYxNGQxN2IzZWVkNTk3ZDYwMjE1
+    MDA3OTVlMjkwYzAzZDhiNDc2NTM2YzFmYWJlNWRlMjNkYTZhMzE=

data/share/views/public/js/_ajax_replace.js

@@ -1,4 +1,5 @@
-var reload_seconds_for_try = {0: 1, 1: 1, 2: 2, 3: 2, 4: 3, 5: 7, 6: 7, 7: 7, 8: 7, 9: 7, 10: 30, 11: 30, 12: 60, 13: 120, 14: 120, 15: 120, 16: "STOP"}
+//var reload_seconds_for_try = {0: 1, 1: 1, 2: 2, 3: 2, 4: 3, 5: 7, 6: 7, 7: 7, 8: 7, 9: 7, 10: 30, 11: 30, 12: 60, 13: 120, 14: 120, 15: 120, 16: "STOP"}
+var reload_seconds_for_try = {0: 1, 1: "STOP"}
 
 var ajax_processes = []
 function update_ajax_counter(){
@@ -112,7 +113,11 @@ function replace_object(object, href, embedd, complete){
         var reload_seconds = reload_time(object);
 
         if (reload_seconds == "STOP"){
-          object.removeClass("reloading").addClass("error").html("Maximum number or retries reached").attr('reload-attempts', 0);
+          var a =$('<a href="#">').html("insist").click(function(){
+            replace_object(object, href, embedd, complete)
+            return false;
+          })
+          object.empty().removeClass("reloading").addClass("error").addClass('TEST').attr('reload-attempts', 0).html("Maximum number of retries reached ").append(a)
         }else{
           window.setTimeout(function(){replace_object(object, href, embedd, complete)}, reload_seconds * 1000);
         }

data/share/views/public/js/rbbt/actions.js

@@ -91,19 +91,20 @@ $.widget("rbbt.action_controller", {
       var action_div = action_controller.next('.action_loader');
 
       if (jqXHR.status == 202){
-        action_controller.removeClass('active').addClass('loading'); 
-        action_list_item.removeClass('active').addClass('loading');
-
-        var response = $(jqXHR.responseText)
-        var stat = response.find('span.status').html()
-        var message = response.find('ul.step_messages li:first').html()
-
-        if (undefined === message){
-          action_div.html("<span class='loading'>Loading [" + stat + "] ...</span>");
-        }else{
-          action_div.html("<span class='loading'>Loading [" + stat + ": " + message + "] ...</span>");
-        };
-
+        if (action_div.attr('reload-attempts') != '0'){
+          action_controller.removeClass('active').addClass('loading'); 
+          action_list_item.removeClass('active').addClass('loading');
+
+          var response = $(jqXHR.responseText)
+          var stat = response.find('span.status').html()
+          var message = response.find('ul.step_messages li:first').html()
+
+          if (undefined === message){
+            action_div.html("<span class='loading'>Loading [" + stat + "] ...</span>");
+          }else{
+            action_div.html("<span class='loading'>Loading [" + stat + ": " + message + "] ...</span>");
+          };
+        }
       }else{ 
         action_controller.removeClass('loading').addClass('active'); 
         action_list_item.removeClass('loading').addClass('active');

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.2.11
 platform: ruby
 authors:
 - Miguel Vazquez