\
@@ -592,8 +591,31 @@ var update_template_tmpl =
\
\
\
-
\
-
\
+
\
'+tr("Register time")+' | \
'+pretty_time(template_info.REGTIME)+' | \
\
- \
- | '+tr("Public")+' | \
- '+(parseInt(template_info.PUBLIC) ? tr("yes") : tr("no"))+' | \
-
\
+ | |
\
+ \
+ | '+tr("Owner permissions")+' | \
+ '+ownerPermStr(template_info)+' | \
+
\
+ \
+ | '+tr("Group permissions")+' | \
+ '+groupPermStr(template_info)+' | \
+
\
+ \
+ | '+tr("Other permissions")+' | \
+ '+otherPermStr(template_info)+' | \
+
\
'
};
var template_tab = {
@@ -2002,18 +2028,20 @@ function popUpCreateTemplateDialog(){
function setupTemplateTemplateUpdateDialog(){
//Append to DOM
- dialogs_context.append('');
+ dialogs_context.append('');
var dialog = $('#template_template_update_dialog',dialogs_context);
//Put HTML in place
dialog.html(update_template_tmpl);
+ var height = Math.floor($(window).height()*0.8); //set height to a percentage of the window
+
//Convert into jQuery
dialog.dialog({
autoOpen:false,
width:700,
modal:true,
- height:480,
+ height:height,
resizable:false,
});
@@ -2021,43 +2049,42 @@ function setupTemplateTemplateUpdateDialog(){
$('#template_template_update_select',dialog).change(function(){
var id = $(this).val();
+ $('.permissions_table input',dialog).removeAttr('checked')
+ $('.permissions_table',dialog).removeAttr('update');
if (id && id.length){
var dialog = $('#template_template_update_dialog');
$('#template_template_update_textarea',dialog).val(tr("Loading")+"...");
- var templ_public = is_public_template(id);
-
- if (templ_public){
- $('#template_template_update_public',dialog).attr('checked','checked')
- } else {
- $('#template_template_update_public',dialog).removeAttr('checked')
- }
-
+ Sunstone.runAction("Template.fetch_permissions",id);
Sunstone.runAction("Template.fetch_template",id);
} else {
$('#template_template_update_textarea',dialog).val("");
};
});
- $('#template_template_update_button',dialog).click(function(){
- var dialog = $('#template_template_update_dialog');
+ $('.permissions_table input',dialog).change(function(){
+ $(this).parents('table').attr('update','update');
+ });
+
+ $('form',dialog).submit(function(){
+ var dialog = $(this);
var new_template = $('#template_template_update_textarea',dialog).val();
var id = $('#template_template_update_select',dialog).val();
if (!id || !id.length) {
- dialog.dialog('close');
+ $(this).parents('#template_template_update_dialog').dialog('close');
return false;
};
- var old_public = is_public_template(id);
-
- var new_public = $('#template_template_update_public:checked',dialog).length;
-
- if (old_public != new_public){
- if (new_public) Sunstone.runAction("Template.publish",id);
- else Sunstone.runAction("Template.unpublish",id);
+ var permissions = $('.permissions_table',dialog);
+ if (permissions.attr('update')){
+ var perms = {
+ octet : buildOctet(permissions)
+ };
+ Sunstone.runAction("Template.chmod",id,perms);
};
Sunstone.runAction("Template.update",id,new_template);
+ $(this).parents('#template_template_update_dialog').dialog('close');
dialog.dialog('close');
return false;
});
@@ -2076,7 +2103,8 @@ function popUpTemplateTemplateUpdateDialog(){
var dialog = $('#template_template_update_dialog');
$('#template_template_update_select',dialog).html(select);
$('#template_template_update_textarea',dialog).val("");
- $('#template_template_update_public',dialog).removeAttr('checked')
+ $('.permissions_table input',dialog).removeAttr('checked');
+ $('.permissions_table',dialog).removeAttr('update');
if (sel_elems.length >= 1){ //several items in the list are selected
//grep them
@@ -2092,7 +2120,6 @@ function popUpTemplateTemplateUpdateDialog(){
$('#template_template_update_select option',dialog).attr('selected','selected');
$('#template_template_update_select',dialog).trigger("change");
};
-
};
dialog.dialog('open');
@@ -2110,25 +2137,8 @@ function setTemplateAutorefresh() {
Sunstone.runAction("Template.autorefresh");
}
},INTERVAL+someTime());
-}
-
-function is_public_template(id){
- var data = getElementData(id,"#template",dataTable_templates)[6];
- return $(data).attr('checked');
};
-function setupTemplateActionCheckboxes(){
- $('input.action_cb#cb_public_template',dataTable_templates).live("click",function(){
- var $this = $(this)
- var id=$this.attr('elem_id');
- if ($this.attr('checked'))
- Sunstone.runAction("Template.publish",id);
- else Sunstone.runAction("Template.unpublish",id);
-
- return true;
- });
-}
-
//The DOM is ready at this point
$(document).ready(function(){
@@ -2139,29 +2149,28 @@ $(document).ready(function(){
"sPaginationType": "full_numbers",
"aoColumnDefs": [
{ "bSortable": false, "aTargets": ["check"] },
- { "sWidth": "60px", "aTargets": [0,6] },
+ { "sWidth": "60px", "aTargets": [0] },
{ "sWidth": "35px", "aTargets": [1] },
{ "sWidth": "150px", "aTargets": [5] },
{ "sWidth": "100px", "aTargets": [2,3] }
],
- "oLanguage": (datatable_lang != "") ?
- {
- sUrl: "locale/"+lang+"/"+datatable_lang
- } : ""
+ "oLanguage": (datatable_lang != "") ?
+ {
+ sUrl: "locale/"+lang+"/"+datatable_lang
+ } : ""
});
dataTable_templates.fnClearTable();
addElement([
spinner,
- '','','','','',''],dataTable_templates);
+ '','','','',''],dataTable_templates);
Sunstone.runAction("Template.list");
setupCreateTemplateDialog();
setupTemplateTemplateUpdateDialog();
- setupTemplateActionCheckboxes();
setTemplateAutorefresh();
initCheckAllBoxes(dataTable_templates);
tableCheckboxesListener(dataTable_templates);
templateInfoListener();
-})
+});
diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js
index d67617974f..609f7ac91b 100644
--- a/src/sunstone/public/js/plugins/vms-tab.js
+++ b/src/sunstone/public/js/plugins/vms-tab.js
@@ -443,7 +443,7 @@ var vm_actions = {
error: onError,
notify: true
},
-}
+};
diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js
index 486535c640..c206a0aae1 100644
--- a/src/sunstone/public/js/plugins/vnets-tab.js
+++ b/src/sunstone/public/js/plugins/vnets-tab.js
@@ -322,7 +322,7 @@ var vnet_actions = {
},
"Network.chmod" : {
- type: "multiple",
+ type: "single",
call: OpenNebula.Network.chmod,
// callback
error: onError,