From 253738d6e88c11b04f13d55044594cb95b9d6ac8 Mon Sep 17 00:00:00 2001
From: Diego del Corral <dcorral@opennebula.org>
Date: Fri, 17 Nov 2017 21:20:54 +0100
Subject: [PATCH]  Added error message for change-body function + trailling
 spaces fixed

---
 src/oca/ruby/opennebula/error.rb              |  2 +-
 src/onedb/onedb                               |  2 +-
 src/onedb/onedb_live.rb                       | 24 +++++++++++--------
 .../app/tabs/users-tab/panels/auth-common.js  |  2 +-
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/oca/ruby/opennebula/error.rb b/src/oca/ruby/opennebula/error.rb
index 41ac9e927a..e287b75950 100644
--- a/src/oca/ruby/opennebula/error.rb
+++ b/src/oca/ruby/opennebula/error.rb
@@ -31,7 +31,7 @@ module OpenNebula
         EALLOCATE       = 0x4000
         ENOTDEFINED     = 0xF001
         EXML_RPC_CALL   = 0xF002
-        
+
         attr_reader :message, :errno
 
         # +message+ Description of the error
diff --git a/src/onedb/onedb b/src/onedb/onedb
index 486270f9fb..ec83683102 100755
--- a/src/onedb/onedb
+++ b/src/onedb/onedb
@@ -570,7 +570,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             * --id: vm id, example: 156
             * --seq: sequence number of the record, example: 0
 
-        The new value for this elemente is set in the third parameter.   
+        The new value for this elemente is set in the third parameter.
 
         Change the the hostname of first record:
 
diff --git a/src/onedb/onedb_live.rb b/src/onedb/onedb_live.rb
index 8da0bc0621..38bf7ce1c1 100644
--- a/src/onedb/onedb_live.rb
+++ b/src/onedb/onedb_live.rb
@@ -82,22 +82,27 @@ class OneDBLive
     def select(table, where)
         sql = "SELECT * FROM #{table} WHERE #{where}"
         res = db_query(sql, "Error querying database")
-
+        
         element = OpenNebula::XMLElement.new(
             OpenNebula::XMLElement.build_xml(res, '/SQL_COMMAND'))
-
+        
         hash = element.to_hash
-
-        row = hash['SQL_COMMAND']['RESULT']['ROW'] rescue nil
+        row  = hash['SQL_COMMAND']['RESULT']['ROW'] rescue nil
+        
+        if !row
+            raise "Empty SQL query result: "
+        end
+        
         [row].flatten.compact
     end
 
     def db_query(sql, error_msg)
         rc = system_db.sql_query_command(sql)
+        
         if OpenNebula.is_error?(rc)
             raise "#{error_msg}: #{rc.message}"
         end
-
+        
         rc
     end
 
@@ -390,13 +395,13 @@ class OneDBLive
 
     def change_body(object, xpath, value, options = {})
         table, object, federate = get_pool_config(object)
-
         if !value && !options[:delete]
             raise "A value or --delete should specified"
         end
-
-        object.info_all
-
+        
+        rc = object.info_all
+        raise rc.message if OpenNebula.is_error?(rc)
+        
         object.each do |o|
             if options[:id]
                 next unless o.id.to_s.strip == options[:id].to_s
@@ -405,7 +410,6 @@ class OneDBLive
             elsif options[:expr]
                 next unless check_expr(o, options[:expr])
             end
-
             # Get body from the database
             begin
                 db_data = select(table, "oid = #{o.id}")
diff --git a/src/sunstone/public/app/tabs/users-tab/panels/auth-common.js b/src/sunstone/public/app/tabs/users-tab/panels/auth-common.js
index f3dbb2686e..d0de116782 100644
--- a/src/sunstone/public/app/tabs/users-tab/panels/auth-common.js
+++ b/src/sunstone/public/app/tabs/users-tab/panels/auth-common.js
@@ -30,7 +30,7 @@ define(function(require) {
   /*
     TEMPLATES
    */
- 
+
   var TemplateTable = require('utils/panel/template-table');
 
   /*