shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Fix bug in oneuser show when the user has no privileges

Browse Source
This commit is contained in:
Daniel Molina 2011-08-24 11:47:01 +02:00
parent 92edeb5a0a
commit 4ea2629a51
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/cli/one_helper.rb
View File

@ -173,7 +173,10 @@ EOT
def to_id(name)
return 0, name if name.match(/^[0123456789]+$/)
pool = get_pool
rc = get_pool
return rc if rc.first != 0
pool = rc[1]
poolname = self.class.rname
OneHelper.name_to_id(name, pool, poolname)
@ -184,7 +187,10 @@ EOT
end
def list_to_id(names)
pool = get_pool
rc = get_pool
return rc if rc.first != 0
pool = rc[1]
poolname = self.class.rname
result = names.split(',').collect { |name|
@ -194,7 +200,7 @@ EOT
rc = OneHelper.name_to_id(name, pool, poolname)
if rc.first==-1
return -1, "OpenNebula #{self.rname} #{name} " <<
return -1, "OpenNebula #{poolname} #{name} " <<
"not found, use the ID instead"
end
@ -305,12 +311,12 @@ EOT
rc = pool.info
if OpenNebula.is_error?(rc)
return -1, "OpenNebula #{self.rname} name not found," <<
" use the ID instead"
return -1, "OpenNebula #{self.class.rname} name not " <<
"found, use the ID instead"
end
end
pool
return 0, pool
end
end
@ -327,7 +333,7 @@ EOT
rc = pool.info
if OpenNebula.is_error?(rc)
return -1, "OpenNebula #{self.rname} name not found," <<
return -1, "OpenNebula #{poolname} name not found," <<
" use the ID instead"
end