zabbixapi 0.5.3b4 → 0.5.3b5

data/lib/zabbixapi/1.8/classes/screens.rb

@@ -29,7 +29,7 @@ class ZabbixApi
     end
 
     def delete(data)
-      result = @client.api_request(:method => "screen.delete", :params => data)
+      result = @client.api_request(:method => "screen.delete", :params => [data])
       result.empty? ? nil : result['screenids'][0].to_i
     end
 
@@ -41,27 +41,27 @@ class ZabbixApi
       valign = data[:valign] || 2
       halign = data[:halign] || 2
       vsize = data[:vsize] || ((graphids.size/hsize) + 1).to_i
-      if screenid = get_id(:name => screen_name)
-        delete(screenid.to_s)
+      screenid = get_id(:name => screen_name)
+      unless screenid
+        # Create screen
+        graphids.each_with_index do |graphid, index|
+          screenitems << {
+            :resourcetype => 0,
+            :resourceid => graphid,
+            :x => (index % hsize).to_i,
+            :y => (index % graphids.size/hsize).to_i,
+            :valign =>valign,
+            :halign =>halign
+          }
+        end
+        screenid = create(
+          :name => screen_name,
+          :hsize => hsize,
+          :vsize => vsize,
+          :screenitems => screenitems
+        )
       end
-      # create screan
-      graphids.each_with_index do |graphid, index|
-        screenitems << {
-          :resourcetype => 0,
-          :resourceid => graphid,
-          :x => (index % hsize).to_i,
-          :y => (index % graphids.size/hsize).to_i,
-          :valign =>valign,
-          :halign =>halign
-        }
-      end
-
-      create(
-        :name => screen_name,
-        :hsize => hsize,
-        :vsize => vsize,
-        :screenitems => screenitems
-      )
+      screenid
     end
 
   end

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "0.5.3b4"
+  VERSION = "0.5.3b5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.5.3b4
+  version: 0.5.3b5
   prerelease: 5
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -98,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 317957260170769682
+      hash: -1581841498466242138
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: