mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-21 04:12:37 +09:00
feature #3671: Move Sunstone group settings to a SUNSTONE vector inside the template
This commit is contained in:
1 parent
6b08f7a69f
commit
30087b067f
4 files changed
+52
-43
No files matched your search
@@ -139,31 +139,38 @@ module OpenNebula
|
||||
return OpenNebula::Error.new(error_msg)
|
||||
end
|
||||
|
||||
str = ""
|
||||
sunstone_attrs = []
|
||||
|
||||
# Add Sunstone views for the group
|
||||
if group_hash[:views]
|
||||
str += "SUNSTONE_VIEWS=\"#{group_hash[:views].join(",")}\"\n"
|
||||
sunstone_attrs << "VIEWS=\"#{group_hash[:views].join(",")}\""
|
||||
end
|
||||
|
||||
if group_hash[:default_view]
|
||||
str += "DEFAULT_VIEW=\"#{group_hash[:default_view]}\"\n"
|
||||
sunstone_attrs << "DEFAULT_VIEW=\"#{group_hash[:default_view]}\""
|
||||
end
|
||||
|
||||
# And the admin views
|
||||
if group_hash[:admin_views]
|
||||
str += "GROUP_ADMIN_VIEWS=\"#{group_hash[:admin_views].join(",")}\"\n"
|
||||
sunstone_attrs << "GROUP_ADMIN_VIEWS=\"#{group_hash[:admin_views].join(",")}\""
|
||||
else
|
||||
str += "GROUP_ADMIN_VIEWS=#{GROUP_ADMIN_SUNSTONE_VIEWS}\n"
|
||||
sunstone_attrs << "GROUP_ADMIN_VIEWS=#{GROUP_ADMIN_SUNSTONE_VIEWS}"
|
||||
end
|
||||
|
||||
if group_hash[:default_admin_view]
|
||||
str += "GROUP_ADMIN_DEFAULT_VIEW=\"#{group_hash[:default_admin_view]}\"\n"
|
||||
sunstone_attrs << "GROUP_ADMIN_DEFAULT_VIEW=\"#{group_hash[:default_admin_view]}\""
|
||||
else
|
||||
str += "GROUP_ADMIN_DEFAULT_VIEW=#{GROUP_ADMIN_SUNSTONE_VIEWS}"
|
||||
sunstone_attrs << "GROUP_ADMIN_DEFAULT_VIEW=#{GROUP_ADMIN_SUNSTONE_VIEWS}"
|
||||
end
|
||||
|
||||
self.update(str, true)
|
||||
if sunstone_attrs.length > 0
|
||||
rc = self.update("SUNSTONE=[#{sunstone_attrs.join(',\n')}]", true)
|
||||
if OpenNebula.is_error?(rc)
|
||||
self.delete
|
||||
error_msg = "Error updating group template: #{rc.message}"
|
||||
return OpenNebula::Error.new(error_msg)
|
||||
end
|
||||
end
|
||||
|
||||
return 0
|
||||
end
|
||||
|
||||
@@ -80,15 +80,15 @@ class SunstoneViews
|
||||
return available.uniq
|
||||
end
|
||||
|
||||
if group["TEMPLATE/SUNSTONE_VIEWS"]
|
||||
views_array = group["TEMPLATE/SUNSTONE_VIEWS"].split(",")
|
||||
if group["TEMPLATE/SUNSTONE/VIEWS"]
|
||||
views_array = group["TEMPLATE/SUNSTONE/VIEWS"].split(",")
|
||||
available << views_array.each{|v| v.strip!}
|
||||
elsif @views_config['groups']
|
||||
available << @views_config['groups'][group.name]
|
||||
end
|
||||
|
||||
gadmins = group.admin_ids
|
||||
gadmins_views = group["TEMPLATE/GROUP_ADMIN_VIEWS"]
|
||||
gadmins_views = group["TEMPLATE/SUNSTONE/GROUP_ADMIN_VIEWS"]
|
||||
|
||||
if gadmins && gadmins.include?(user.id) && gadmins_views
|
||||
views_array = gadmins_views.split(",")
|
||||
|
||||
@@ -255,30 +255,32 @@ define(function(require) {
|
||||
} else if (this.action == "update") {
|
||||
var template_json = this.element.TEMPLATE;
|
||||
|
||||
delete template_json["SUNSTONE_VIEWS"];
|
||||
delete template_json["DEFAULT_VIEW"];
|
||||
delete template_json["GROUP_ADMIN_VIEWS"];
|
||||
delete template_json["GROUP_ADMIN_DEFAULT_VIEW"];
|
||||
delete template_json['SUNSTONE'];
|
||||
|
||||
var sunstone_template = {};
|
||||
if (views.length != 0){
|
||||
template_json["SUNSTONE_VIEWS"] = views.join(",");
|
||||
sunstone_template["VIEWS"] = views.join(",");
|
||||
}
|
||||
|
||||
if (default_view != undefined){
|
||||
template_json["DEFAULT_VIEW"] = default_view;
|
||||
sunstone_template["DEFAULT_VIEW"] = default_view;
|
||||
}
|
||||
|
||||
if (admin_views.length != 0){
|
||||
template_json["GROUP_ADMIN_VIEWS"] = admin_views.join(",");
|
||||
sunstone_template["GROUP_ADMIN_VIEWS"] = admin_views.join(",");
|
||||
}
|
||||
|
||||
if (default_admin_view != undefined){
|
||||
template_json["GROUP_ADMIN_DEFAULT_VIEW"] = default_admin_view;
|
||||
sunstone_template["GROUP_ADMIN_DEFAULT_VIEW"] = default_admin_view;
|
||||
}
|
||||
|
||||
if (!$.isEmptyObject(sunstone_template)) {
|
||||
template_json['SUNSTONE'] = sunstone_template;
|
||||
}
|
||||
|
||||
var template_str = TemplateUtils.templateToString(template_json);
|
||||
|
||||
Sunstone.runAction("Group.update",this.resourceId, template_str);
|
||||
Sunstone.runAction("Group.update", this.resourceId, template_str);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -305,8 +307,9 @@ define(function(require) {
|
||||
|
||||
$('input[id^="group_view"]', context).removeAttr('checked');
|
||||
|
||||
if (element.TEMPLATE.SUNSTONE_VIEWS){
|
||||
views_str = element.TEMPLATE.SUNSTONE_VIEWS;
|
||||
var sunstone_template = element.TEMPLATE.SUNSTONE;
|
||||
if (sunstone_template && sunstone_template.VIEWS){
|
||||
views_str = sunstone_template.VIEWS;
|
||||
|
||||
var views = views_str.split(",");
|
||||
$.each(views, function(){
|
||||
@@ -317,16 +320,16 @@ define(function(require) {
|
||||
|
||||
$('input[id^="group_default_view"]', context).removeAttr('checked');
|
||||
|
||||
if (element.TEMPLATE.DEFAULT_VIEW){
|
||||
$('#user_view_default', context).val(element.TEMPLATE.DEFAULT_VIEW.trim()).change();
|
||||
if (sunstone_template && sunstone_template.DEFAULT_VIEW){
|
||||
$('#user_view_default', context).val(sunstone_template.DEFAULT_VIEW.trim()).change();
|
||||
} else {
|
||||
$('#user_view_default', context).val("").change();
|
||||
}
|
||||
|
||||
$('input[id^="group_admin_view"]', context).removeAttr('checked');
|
||||
|
||||
if (element.TEMPLATE.GROUP_ADMIN_VIEWS){
|
||||
views_str = element.TEMPLATE.GROUP_ADMIN_VIEWS;
|
||||
if (sunstone_template && sunstone_template.GROUP_ADMIN_VIEWS){
|
||||
views_str = sunstone_template.GROUP_ADMIN_VIEWS;
|
||||
|
||||
var views = views_str.split(",");
|
||||
$.each(views, function(){
|
||||
@@ -337,8 +340,8 @@ define(function(require) {
|
||||
|
||||
$('input[id^="group_default_admin_view"]', context).removeAttr('checked');
|
||||
|
||||
if (element.TEMPLATE.GROUP_ADMIN_DEFAULT_VIEW){
|
||||
$('#admin_view_default', context).val(element.TEMPLATE.GROUP_ADMIN_DEFAULT_VIEW.trim()).change();
|
||||
if (sunstone_template && sunstone_template.GROUP_ADMIN_DEFAULT_VIEW){
|
||||
$('#admin_view_default', context).val(sunstone_template.GROUP_ADMIN_DEFAULT_VIEW.trim()).change();
|
||||
} else {
|
||||
$('#admin_view_default', context).val("").change();
|
||||
}
|
||||
|
||||
@@ -63,21 +63,23 @@ define(function(require) {
|
||||
*/
|
||||
|
||||
function _html() {
|
||||
var adminViews = _processViews(
|
||||
this.element.TEMPLATE.GROUP_ADMIN_VIEWS,
|
||||
this.element.TEMPLATE.GROUP_ADMIN_DEFAULT_VIEW);
|
||||
var adminViews = [];
|
||||
var userViews = [];
|
||||
|
||||
var userViews = _processViews(
|
||||
this.element.TEMPLATE.SUNSTONE_VIEWS,
|
||||
this.element.TEMPLATE.DEFAULT_VIEW);
|
||||
var sunstone_template = this.element.TEMPLATE.SUNSTONE;
|
||||
if (sunstone_template) {
|
||||
adminViews = _processViews(
|
||||
sunstone_template.GROUP_ADMIN_VIEWS,
|
||||
sunstone_template.GROUP_ADMIN_DEFAULT_VIEW);
|
||||
|
||||
userViews = _processViews(
|
||||
sunstone_template.VIEWS,
|
||||
sunstone_template.DEFAULT_VIEW);
|
||||
}
|
||||
|
||||
// TODO: simplify interface?
|
||||
var strippedTemplate = $.extend({}, this.element.TEMPLATE);
|
||||
delete strippedTemplate["GROUP_ADMIN_VIEWS"];
|
||||
delete strippedTemplate["SUNSTONE_VIEWS"];
|
||||
delete strippedTemplate["GROUP_ADMIN_DEFAULT_VIEW"];
|
||||
delete strippedTemplate["DEFAULT_VIEW"];
|
||||
delete strippedTemplate["TABLE_DEFAULT_PAGE_LENGTH"];
|
||||
delete strippedTemplate["SUNSTONE"];
|
||||
|
||||
var templateTableHTML = TemplateTable.html(strippedTemplate, RESOURCE,
|
||||
Locale.tr("Attributes"));
|
||||
@@ -99,10 +101,7 @@ define(function(require) {
|
||||
// Template update
|
||||
// TODO: simplify interface?
|
||||
var hiddenKeys = [
|
||||
"GROUP_ADMIN_VIEWS",
|
||||
"SUNSTONE_VIEWS",
|
||||
"GROUP_ADMIN_DEFAULT_VIEW",
|
||||
"DEFAULT_VIEW",
|
||||
"SUNSTONE",
|
||||
"TABLE_DEFAULT_PAGE_LENGTH"];
|
||||
|
||||
var strippedTemplate = $.extend({}, this.element.TEMPLATE);
|
||||
|
||||
Reference in new issue
Block a user