From 15af612918908fbe13094a0c1415be8c5b006cca Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Fri, 28 Feb 2014 16:40:39 +0100 Subject: [PATCH] Feature #2696: Improve Sunstone views assigments --- src/sunstone/models/SunstoneViews.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/sunstone/models/SunstoneViews.rb b/src/sunstone/models/SunstoneViews.rb index 1c4177de05..66fa6700ab 100644 --- a/src/sunstone/models/SunstoneViews.rb +++ b/src/sunstone/models/SunstoneViews.rb @@ -57,12 +57,19 @@ class SunstoneViews group = OpenNebula::Group.new_with_id(user.gid, $cloud_auth.client(user_name)) group.info + available_views = Array.new if group["TEMPLATE/SUNSTONE_VIEWS"] available_views = group["TEMPLATE/SUNSTONE_VIEWS"].split(",") - else - available_views = ['cloud'] end + static_views = @views_config['users'][user_name] if @views_config['users'] + static_views ||= @views_config['groups'][group_name] if @views_config['groups'] + static_views ||= @views_config['default'] + + available_views.concat(static_views) + available_views.select!{|view_name| @views[view_name]} + available_views.uniq! + return available_views end