glib-web 3.14.0 → 3.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33411954512fada9329818d4e011f5cb70f9c528a034fd87b8737318af18e07d
-  data.tar.gz: 492020f2693abdd8ffc38334c771cbe550952044f3030f9221fe163c5c49b103
+  metadata.gz: 73a7b9c04e171d374cba337720592ea50ac8ef1a7d15d1af315490d7cfa1f044
+  data.tar.gz: c583570b3b87c94fb65202efbb31fd67a324e1139466154739e2ae0ed0afc3d3
 SHA512:
-  metadata.gz: 97d3edb87b4e25bb71318dea8dd8243a2f98be27f74ac612e135100bfb5b12317c2b39e763f4e1301c2e3c08736fa7411f91a5a37eea96e1148b0d9d0e1e9841
-  data.tar.gz: 032b11ef90b8b22768459248da39de1a16f6342940cd902974bc96dc7d5a7c11acd7797d599e14bf21b11979b4ed237c053f9d82855856f29a7453b4f6ae98c4
+  metadata.gz: d117002112d56a0a729cdebf8aca501154597d048df97dfe8de90a4fc11cebe35343fb9a904d9930fbe90bb52b882467f33d4b1207949c1935b1ba0164acae8c
+  data.tar.gz: 31efc5d359c71fd256e0597ce3396bf5123fe9d70c7f0e3f26f092154fb9ac71b77e18e106d5bcce44bb4f783f7a9640d01ae35af6920b261ce3a0e9cecd36db

data/app/controllers/concerns/glib/json/libs.rb

@@ -66,7 +66,7 @@ module Glib::Json::Libs
         redirect_to url
       end
       format.json do
-        glib_json_redirect_to url
+        json_ui_redirect_to url
       end
     end
   end
@@ -132,16 +132,21 @@ module Glib::Json::Libs
   end
 
   def __delete_redirect_back_url(url)
-    redirect_url = session.delete(REDIRECT_BACK_KEY) || url
+    session.delete(REDIRECT_BACK_KEY) || url
   end
 
-  def glib_redirect_back_or_to(url)
-    redirect_url = __delete_redirect_back_url(url)
-    glib_redirect_to redirect_url
+  # def glib_redirect_back_or_to(default_url)
+  #   redirect_url = __delete_redirect_back_url(default_url)
+  #   glib_redirect_to redirect_url
+  # end
+
+  def html_ui_redirect_back_or_to(default_url)
+    redirect_url = __delete_redirect_back_url(default_url)
+    redirect_to redirect_url
   end
 
-  def json_ui_redirect_back_or_to(url, json_action)
-    redirect_url = __delete_redirect_back_url(url)
+  def json_ui_redirect_back_or_to(default_url, json_action)
+    redirect_url = __delete_redirect_back_url(default_url)
     json_action.windows_closeAll onClose: ->(subaction) do
       subaction.windows_open url: redirect_url
     end
@@ -182,7 +187,7 @@ module Glib::Json::Libs
     end
   end
 
-  def glib_json_redirect_to(url)
+  def json_ui_redirect_to(url)
     render json: {
       onResponse: { action: 'dialogs/close', onClose: { action: 'windows/open', url: url } }
     }

data/app/helpers/glib/json_ui/view_builder/charts.rb

@@ -41,6 +41,7 @@ class Glib::JsonUi::ViewBuilder
       string :suffix
       int :min
       int :max
+      string :legend
       # idea for the future
       # hash :nextPage
     end
@@ -54,6 +55,7 @@ class Glib::JsonUi::ViewBuilder
       string :suffix
       int :min
       int :max
+      string :legend
     end
 
     class Pie < View
@@ -63,6 +65,7 @@ class Glib::JsonUi::ViewBuilder
       string :suffix
       int :min
       int :max
+      string :legend
 
     end
 

data/app/views/json_ui/garage/views/charts.json.jbuilder

@@ -43,7 +43,7 @@ else
           json.points points.map { |k, v| { x: k, y: v } }
         end
       ],
-      colors: ['#79AC78', '#3085C3']
+      colors: ['#79AC78', '#3085C3'], legend: 'bottom'
 
       # scroll.spacer height: 20
       # scroll.h1 text: 'Line chart using remote data'
@@ -79,7 +79,7 @@ else
           json.points points
         end
       ],
-      colors: ['#b00', '#666', '#E55604']
+      colors: ['#b00', '#666', '#E55604'], legend: 'left'
 
       scroll.h2 text: 'Column chart (Stacked)'
       scroll.charts_column stacked: true, dataGroups: [
@@ -110,7 +110,7 @@ else
           }
           json.points points
         end
-      ]
+      ], legend: 'bottom'
 
       scroll.h2 text: 'Pie chart'
       scroll.charts_pie dataSeries: [
@@ -122,7 +122,7 @@ else
           json.title 'Banana'
           json.value 25
         end
-      ]
+      ], legend: 'bottom'
 
       scroll.h2 text: 'Area chart'
       scroll.charts_area dataSeries: [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 3.14.0
+  version: 3.14.2
 platform: ruby
 authors:
 - ''
@@ -326,8 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: ''