rbbt-rest 1.8.28 → 1.8.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41175a53643022914e1748abb683ea2c577fbce4
-  data.tar.gz: 9aba66c9881e811a75504e5467ff55630ce39d1a
+  metadata.gz: 7b60a061b2e9ab0e00bfc2e3fc61fa17a999f99f
+  data.tar.gz: 90e2b5eccfbef1847563be6fe612205621e7c9db
 SHA512:
-  metadata.gz: 64c67a4be12334cb2ab0cab0f2f1b4c1b8a53496f52e3b6089d0d177bf4e7760d7eb024be5463e12008deac1541a8550f7c3136ced1a0ab47f7e11fcaed83554
-  data.tar.gz: ca2159927a0174ce9ec4f0666120fa3772e3c3f618b72d0a18da3b06ef4291671486a9180d2ffc643ca71c523ebf6ee91773de3bc594a3f76f6cd0cd22d9c866
+  metadata.gz: c70e3a18dea50ecc6c3b86e0cc57f6360e1f06a60a4e473264665b270d769690869c44182a7164873baeb28525e6a4df87ffa6bc231ce57e5c1cee1659d29abf
+  data.tar.gz: d893f86e65b56fbba4b94eca7201ec3b6b14eb9b0b532f79cae04e20252d0a5f49b6f4346a56d327d35f6fe16077cf331920c5a40344ab15f7084c6ae78f5966

data/lib/rbbt/rest/workflow.rb

@@ -73,7 +73,7 @@ module Sinatra
 
         case format
         when :html
-          workflow_render('task_info', workflow)
+          workflow_render('task_info', workflow, nil, :cache => false )
         when :json
           content_type "application/json"
           workflow.task_info(task.to_sym).to_json

data/lib/rbbt/rest/workflow/render.rb

@@ -29,8 +29,11 @@ module WorkflowRESTHelpers
       html_dir = job.file('.html')
       FileUtils.mkdir_p html_dir.find unless File.exists? html_dir.find
       cache_file = html_dir[server_key]
+      cache_type = false if params[:cache] == FalseClass
       render(template_file, locals, layout_file, [task,workflow,job.name] * "-", :cache_type => cache_type, :cache_file => cache_file)
     else
+      cache_type = :async
+      cache_type = false if params[:cache] == FalseClass
       render(template_file, locals, layout_file, [workflow, task, template_file].compact * "-", :cache_type => :async )
     end
   end

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

@@ -112,11 +112,17 @@ function replace_object(object, href, embedd, complete){
       href = remove_parameter(href, '_update');
       href = remove_parameter(href, '_');
 
-      error_message = error.sub(/\n\n.*/,'')
 
-      error_span = $('<span>').html(error_message).addClass('error')
-      error = $('<div>') //.append(error_span)
-      error.append(req.responseText)
+      if (req.responseText.match('error_message') != null){
+        error_message = $(req.responseText).find('.error_message').html()
+      }else{
+        error_message = req.responseText.split("\n")[0]
+      }
+
+      error_span = escape
+
+      error_span = $('<span>').text(error_message).addClass('error')
+      error = $('<div>').append(error_span).addClass('ui segment error message')
       object.removeClass(_reloading_class).addClass("error").css('height', 0).html(error).css('height', 'auto').attr('target-href', clean_href);
     },
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.28
+  version: 1.8.29
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -202,75 +202,6 @@ files:
 - share/views/compass/card_templates.sass
 - share/views/compass/layout.sass
 - share/views/compass/misc.sass
-- share/views/compass/old/base/backgrounds.sass
-- share/views/compass/old/base/blocks.sass
-- share/views/compass/old/base/color.sass
-- share/views/compass/old/base/colors.sass
-- share/views/compass/old/base/font-scale.sass
-- share/views/compass/old/base/fonts.sass
-- share/views/compass/old/base/hide.sass
-- share/views/compass/old/base/icon_content.scss
-- share/views/compass/old/base/icons.sass
-- share/views/compass/old/base/material.sass
-- share/views/compass/old/base/misc.sass
-- share/views/compass/old/base/screen_sizes.sass
-- share/views/compass/old/base/text.sass
-- share/views/compass/old/base/util.sass
-- share/views/compass/old/base/variables.sass
-- share/views/compass/old/base/variables/color.sass
-- share/views/compass/old/blocks.sass
-- share/views/compass/old/cards.sass
-- share/views/compass/old/color.sass
-- share/views/compass/old/color/blocks.sass
-- share/views/compass/old/color/buttons.sass
-- share/views/compass/old/color/elements.sass
-- share/views/compass/old/color/font.sass
-- share/views/compass/old/color/top_bar.sass
-- share/views/compass/old/elements.sass
-- share/views/compass/old/elements/buttons.sass
-- share/views/compass/old/elements/forms.sass
-- share/views/compass/old/elements/lists.sass
-- share/views/compass/old/elements/materials.sass
-- share/views/compass/old/elements/movement.sass
-- share/views/compass/old/elements/positions.sass
-- share/views/compass/old/elements/table.sass
-- share/views/compass/old/elements/tool.sass
-- share/views/compass/old/grid.sass
-- share/views/compass/old/init.sass
-- share/views/compass/old/layout.sass
-- share/views/compass/old/layout/body.sass
-- share/views/compass/old/layout/footer.sass
-- share/views/compass/old/layout/result.sass
-- share/views/compass/old/layout/reveal.sass
-- share/views/compass/old/layout/top_bar.sass
-- share/views/compass/old/layout/top_menu.sass
-- share/views/compass/old/menu.sass
-- share/views/compass/old/menu/accordion_menu.sass
-- share/views/compass/old/menu/actionable.sass
-- share/views/compass/old/menu/dropdown_menu.sass
-- share/views/compass/old/menu/hide.sass
-- share/views/compass/old/menu/menu.sass
-- share/views/compass/old/menu/tab_menu.sass
-- share/views/compass/old/menu/top_bar.sass
-- share/views/compass/old/menu/vertical_menu.sass
-- share/views/compass/old/mixins/_all.sass
-- share/views/compass/old/mixins/_blocks.sass
-- share/views/compass/old/mixins/_compass.sass
-- share/views/compass/old/mixins/_deps.sass
-- share/views/compass/old/mixins/_hide.sass
-- share/views/compass/old/mixins/_keyframes.scss
-- share/views/compass/old/mixins/_semantic-ui.sass
-- share/views/compass/old/new.sass
-- share/views/compass/old/offcanvas.sass
-- share/views/compass/old/position/basic.sass
-- share/views/compass/old/responsive.sass
-- share/views/compass/old/semantic-ui.css
-- share/views/compass/old/semantic-ui/semantic-ui.css
-- share/views/compass/old/space/button.sass
-- share/views/compass/old/table.sass
-- share/views/compass/old/text.sass
-- share/views/compass/old/variables/colors.sass
-- share/views/compass/old/variables/sizes.sass
 - share/views/compass/screen_sizes.sass
 - share/views/compass/tab_menu.sass
 - share/views/entity/Default.haml

data/share/views/compass/old/base/backgrounds.sass

@@ -1,41 +0,0 @@
-%background-white
-  background: white
-  a:not([href="#"])
-    color: $color-link
-
-%background-main
-  background: $color-background-main
-  a:not([href="#"])
-    color: $color-link-alt
-
-%background-subtle
-  background: $color-background-subtle
-  a:not([href="#"])
-    color: $color-link-alt
-
-%background-glassy
-  background: $color-background-glassy
-
-%background-hover
-  background: $color-background-hover
-  a:not([href="#"])
-    color: $color-link-alt
-
-%background-active
-  background: $color-background-active
-  &, a:not([href="#"])
-    color: white
-  
-%background-error
-  background: $color-background-error
-  color: $color-accent
-  & > a
-    color: $color-accent
-  
-=subtle_background
-  @extend %background-subtle
-
-=white_background
-  @extend %background-white
-
-

data/share/views/compass/old/base/blocks.sass

@@ -1,92 +0,0 @@
-@import "susy"
-@import "base/misc"
-@import "base/screen_sizes"
-@import "base/colors"
-@import "base/material"
-@import "base/hide"
-
-=raisable($depth: 1)
-  &.show, &.active
-    +material($depth)
-
-=border( $size: 1px, $padding: 0.25 ) 
-  +rhythm-borders($size,$padding)
-  border-color: $subtle-border
-  &:hover
-    border-color: darken($subtle-border, 20)
-
-=block
-  text-overflow: ellipsis
-  @media #{$only-small}
-    width: 100% 
-
-=padded_block($padsize: 1 of 50, $verticalpad: 1)
-  padding: 16px
-
-=medium_size
-  @media #{$only-small}
-    width: 100% !important
-  @media #{$not-very-large}
-    width: span(1 of 2)
-  @media #{$only-very-large}
-    width: span(1 of 3)
-
-=full_block
-  +block
-  width: 100%
-  overflow: show
-  text-overflow: show
-
-=large_block
-  +block
-  @media #{$only-very-large}
-    +gallery(1 of 2)
-
-=medium_block
-  +block
-  @media #{$not-small}
-    +gallery(1 of 2)
-  @media #{$only-large}
-    +gallery(1 of 3)
-  &.masonry
-    @media #{$only-very-large}
-      +gallery(1 of 4)
-
-=small_block
-  +block
-  @media #{$not-small}
-    +gallery(1 of 2)
-  @media #{$only-very-large}
-    +gallery(1 of 4)
-  &.masonry
-    +gallery(1 of 2)
-    @media #{$only-large}
-      +gallery(4 of 12)
-    @media #{$only-very-large}
-      +gallery(1 of 5)
-
-=ease_margin
-  @include transition-property(margin)
-  @include transition-duration(3s)
-  @include transition-timing-function(ease-in)
-=ease_width
-  @include transition-property(width)
-  @include transition-duration(3s)
-  @include transition-timing-function(ease-in)
-=ease_height
-  @include transition-property(border)
-  @include transition-property(max-height)
-  @include transition-duration(1s)
-  @include transition-timing-function(ease-in)
-=ease_color
-  @include transition-property(color)
-  @include transition-duration(3s)
-  @include transition-timing-function(ease-in)
-
-=ease
-  @include transition-property(top)
-  @include transition-duration(0.6s)
-  @include transition-timing-function(ease-in)
-  
-=boxed
-  +padded_block

data/share/views/compass/old/base/color.sass

@@ -1,66 +0,0 @@
-@import "base/variables/color"
-
-=subtle_color
-  color: $subtle_color
-
-=gold
-  color: gold
-
-=error
-  color: red
-
-$background-transparent: 0.15
-
-$color-background-main: $color-one
-$color-background-alt: $color-one
-
-$color-background-subtle: tint($color-background-alt, 40)
-$color-background-glassy: transparentize($color-background-subtle, 0.18)
-
-$color-background-button: #c9c9c9
-$color-background-active: shade($color-background-button, 40)
-$color-background-hover: shade($color-background-button, 20)
-$color-background-inactive: transparentize($color-background-button, 0.80)
-$color-background-error: $color-accent
-
-%background-white
-  background: white
-  a:not([href="#"])
-    color: $color-link
-
-%background-main
-  background: $color-background-main
-  a:not([href="#"])
-    color: $color-link-alt
-
-%background-subtle
-  background: $color-background-subtle
-  a:not([href="#"])
-    color: $color-link-alt
-
-%background-glassy
-  background: $color-background-glassy
-
-%background-hover
-  background: $color-background-hover
-  a:not([href="#"])
-    color: $color-link-alt
-
-%background-active
-  background: $color-background-active
-  &, a:not([href="#"])
-    color: white
-  
-%background-error
-  background: $color-background-error
-  color: $color-accent
-  & > a
-    color: $color-accent
-  
-=subtle_background
-  @extend %background-subtle
-
-=white_background
-  @extend %background-white
-
-

data/share/views/compass/old/base/colors.sass

@@ -1,66 +0,0 @@
-@import "base/variables/color"
-
-=subtle_color
-  color: $subtle_color
-
-=gold
-  color: gold
-
-=error
-  color: red
-
-$background-transparent: 0.15
-
-$color-background-main: $color-one
-$color-background-alt: $color-one
-
-$color-background-subtle: tint($color-background-alt, 40)
-$color-background-glassy: transparentize($color-background-subtle, 0.18)
-
-$color-background-button: tint($color-background-subtle, 20)
-$color-background-active: shade($color-background-button, 40)
-$color-background-hover: shade($color-background-button, 20)
-$color-background-inactive: transparentize($color-background-button, 0.80)
-$color-background-error: $color-accent
-
-%background-white
-  background: white
-  a:not([href="#"])
-    color: $color-link
-
-%background-main
-  background: $color-background-main
-  a:not([href="#"])
-    color: $color-link-alt
-
-%background-subtle
-  background: $color-background-subtle
-  a:not([href="#"])
-    color: $color-link-alt
-
-%background-glassy
-  background: $color-background-glassy
-
-%background-hover
-  background: $color-background-hover
-  a:not([href="#"])
-    color: $color-link-alt
-
-%background-active
-  background: $color-background-active
-  &, a:not([href="#"])
-    color: white
-  
-%background-error
-  background: $color-background-error
-  color: $color-accent
-  & > a
-    color: $color-accent
-  
-=subtle_background
-  @extend %background-subtle
-
-=white_background
-  @extend %background-white
-
-

data/share/views/compass/old/base/font-scale.sass

@@ -1,20 +0,0 @@
-@import "compass/typography/vertical_rhythm"
-@import "base/variables"
-
-=font-scale($step,$font-size: $base-font-size)
-  $new-font-size: $font-size * $step
-  @if $step > 1
-    @if $step > 1.5
-      @include adjust-font-size-to($new-font-size,2)
-    @else
-      @include adjust-font-size-to($new-font-size,3/2)
-  @else
-    @if $step < 1
-      @if $step < 0.8
-        @include adjust-font-size-to($new-font-size,1/2)
-      @else
-        @include adjust-font-size-to($new-font-size,2/3)
-    @else
-      @include adjust-font-size-to($new-font-size,1)
-
-

data/share/views/compass/old/base/fonts.sass

@@ -1,56 +0,0 @@
-@import "base/variables"
-@import 'base/font-scale'
-
-// Google font
-$main: "Roboto"
-$url: "http://fonts.googleapis.com/css?family=" + $main + ":400,700"
-@import url($url)
-=main_font
-  font-family: $main, monospace
-
-=italic
-  font-style: italic
-
-=light_weight
-  font-weight: 200
-
-=normal_weight
-  font-weight: 500
-
-=bold
-  font-weight: 700
-
-// Google font
-$monospace: "Ubuntu Mono"
-$url: "http://fonts.googleapis.com/css?family=" + $monospace + ":400,700"
-@import url($url)
-=monospace
-  font-family: $monospace, monospace
-
-=clean_style
-  text-decoration: none
-
-=tiny
-  +font-scale(1 - $golden-stepup)
-
-=very-small
-  +font-scale(1 - $golden-stepup/2)
-
-=small
-  +font-scale(1 - $golden-stepup/3)
-  
-=normal
-  +font-scale(1)
-
-=compact
-  line-height: 1.2em
-
-=medium
-  +font-scale(1 + $golden-stepup/2)
-  +light_weight
-
-=large
-  +font-scale(1 + $golden-stepup)
-
-=very-large
-  +font-scale(1 + $golden-stepup*2)