diff --git a/install/static/Makefile.am b/install/static/Makefile.am index ef16a2e99..7097a1f6a 100644 --- a/install/static/Makefile.am +++ b/install/static/Makefile.am @@ -18,6 +18,7 @@ app_DATA = \ jquery-ui.css \ certificate.js \ group.js \ + hbac.js \ host.js \ hostgroup.js \ index.xhtml \ diff --git a/install/static/add.js b/install/static/add.js index 71d08338e..b5f9c16d4 100644 --- a/install/static/add.js +++ b/install/static/add.js @@ -1,5 +1,6 @@ /* Authors: * Pavel Zuna + * Endi Sukma Dewata * * Copyright (C) 2010 Red Hat * see file 'COPYING' for use and warranty information @@ -23,40 +24,108 @@ var IPA_ADD_POPULATE = 1; var IPA_ADD_UPDATE = 2; -function add_dialog_create(obj_name, adl) -{ - var add_dialog = $('
'); +function ipa_add_field(spec) { - function add(evt, called_from_add_and_edit) { + spec = spec || {}; + + var that = {}; + that.name = spec.name; + that.label = spec.label; + + that.init = spec.init; + that.setup = spec.setup; + + return that; +} + +function ipa_add_dialog(spec) { + + spec = spec || {}; + + var that = {}; + that.name = spec.name; + that.title = spec.title; + that.entity_name = spec.entity_name; + + that.init = spec.init; + + that.fields = []; + that.fields_by_name = {}; + + var dialog = $('
'); + + that.get_fields = function() { + return that.fields; + }; + + that.get_field = function(name) { + return that.fields_by_name[name]; + }; + + that.add_field = function(field) { + that.fields.push(field); + that.fields_by_name[field.name] = field; + }; + + that.create_field = function(spec) { + var field = ipa_add_field(spec); + that.add_field(field); + return field; + }; + + that.open = function() { + dialog.empty(); + dialog.attr('id', that.name); + dialog.attr('title', that.title); + + for (var i = 0; i < that.fields.length; ++i) { + var field = that.fields[i]; + if (field.setup) { + field.setup(dialog, IPA_ADD_POPULATE); + } else { + dialog.append(''); + dialog.append(''); + } + } + + dialog.dialog({ + modal: true, + buttons: { + 'Add': that.add, + 'Add and edit': that.add_and_edit, + 'Cancel': that.cancel + } + }); + }; + + that.add = function(evt, called_from_add_and_edit) { var pkey = []; var options = {}; - var pkey_name = ipa_objs[obj_name].primary_key; + var pkey_name = IPA.metadata[that.entity_name].primary_key; function add_win(data, text_status, xhr) { if (called_from_add_and_edit) { var state = {}; - state[obj_name + '-facet'] = 'details'; - state[obj_name + '-pkey'] = pkey[0]; + state[that.entity_name + '-facet'] = 'details'; + state[that.entity_name + '-pkey'] = pkey[0]; $.bbq.pushState(state); } - }; + } - var fields = adl[2]; - for (var i = 0; i < fields.length; ++i) { - var f = fields[i]; - var attr = f[0]; - if (typeof f[2] == 'function') { - var value = f[2](add_dialog, IPA_ADD_UPDATE); + for (var i = 0; i < that.fields.length; ++i) { + var field = that.fields[i]; + if (field.setup) { + var value = field.setup(dialog, IPA_ADD_UPDATE); if (value != null) { - if (attr == pkey_name) + if (field.name == pkey_name) pkey = [value]; else - options[attr] = value; + options[field.name] = value; } } } - add_dialog.find('input').each(function () { + dialog.find('input').each(function () { var jobj = $(this); var attr = jobj.attr('name'); var value = jobj.val(); @@ -68,40 +137,20 @@ function add_dialog_create(obj_name, adl) } }); - ipa_cmd('add', pkey, options, add_win, null, obj_name); - add_dialog.dialog('close'); + ipa_cmd('add', pkey, options, add_win, null, that.entity_name); }; - function add_and_edit(evt) { - add(evt, true); - add_dialog.dialog('close'); + that.add_and_edit = function(evt) { + that.add(evt, true); + dialog.dialog('close'); }; - function cancel() { - add_dialog.dialog('close'); + that.cancel = function() { + dialog.dialog('close'); }; - add_dialog.attr('id', adl[0]); - add_dialog.attr('title', adl[1]); + if (that.init) that.init(); - var fields = adl[2]; - for (var i = 0; i < fields.length; ++i) { - var f = fields[i]; - if (typeof f[2] == 'function') { - f[2](add_dialog, IPA_ADD_POPULATE); - } else { - add_dialog.append(''); - add_dialog.append(''); - } - } - - add_dialog.dialog({ - modal: true, - buttons: { - 'Add': add, - 'Add and edit': add_and_edit, - 'Cancel': cancel - } - }); + return that; } diff --git a/install/static/associate.js b/install/static/associate.js index be189963f..a99fd907b 100644 --- a/install/static/associate.js +++ b/install/static/associate.js @@ -44,13 +44,13 @@ function SerialAssociator(form, manyObjPkeys, on_success) ipa_cmd( form.method,args, options , function(data, text_status, xhr) { if (data.error){ - alert("error adding member: "+data.error.message); + alert('error adding member: '+data.error.message); }else{ associator.associateNext(); } }, function(xhr, text_status, error_thrown) { - alert("associateFailure"); + alert('associateFailure'); }, form.manyObj ); }else{ @@ -74,11 +74,11 @@ function BulkAssociator(form, manyObjPkeys, on_success) var form = this.form; var option = manyObjPkeys.shift(); while(manyObjPkeys.length > 0) { - option += "," + manyObjPkeys.shift(); + option += ',' + manyObjPkeys.shift(); } var options = { - "all":true + 'all':true }; options[form.manyObj] = option; @@ -87,13 +87,13 @@ function BulkAssociator(form, manyObjPkeys, on_success) ipa_cmd( form.method,args, options , function(data, text_status, xhr) { if (data.error){ - alert("error adding member: "+data.error.message); + alert('error adding member: '+data.error.message); }else{ associator.on_success(); } }, function(xhr, text_status, error_thrown) { - alert("associateFailure"); + alert('associateFailure'); }, form.oneObj ); } @@ -127,7 +127,7 @@ function AssociationForm(oneObj, pkey, manyObj, on_success, associatorConstructo this.associatorConstructor = BulkAssociator; this.setup = function() { - var label = ipa_objs[form.manyObj].label; + var label = IPA.metadata[form.manyObj].label; form.dialog.attr('title', 'Enroll '+form.oneObj+' '+form.pkey+' in '+label); @@ -139,20 +139,20 @@ function AssociationForm(oneObj, pkey, manyObj, on_success, associatorConstructo var enrollments = $('#enrollments', form.dialog); enrollments.html(''); - $("#addToList", form.dialog).click(function(){ + $('#addToList', form.dialog).click(function(){ $('#availableList :selected', form.dialog).each(function(i, selected){ enrollments.append(selected); }); $('#availableList :selected', form.dialog).remove(); }); - $("#removeFromList", form.dialog).click(function(){ + $('#removeFromList', form.dialog).click(function(){ $('#enrollments :selected', form.dialog).each(function(i, selected){ availableList.append(selected); }); $('#enrollments :selected', form.dialog).remove(); }); - $("#find", form.dialog).click(function(){ + $('#find', form.dialog).click(function(){ form.search(); }); @@ -170,29 +170,29 @@ function AssociationForm(oneObj, pkey, manyObj, on_success, associatorConstructo this.close = function() { form.dialog.dialog('close'); - } + }; this.search = function() { function search_on_win(data, text_status, xhr) { var results = data.result; - var list = $("#availableList", form.dialog); - list.html(""); + var list = $('#availableList', form.dialog); + list.html(''); - var searchColumn = ipa_objs[form.manyObj].primary_key; + var searchColumn = IPA.metadata[form.manyObj].primary_key; for (var i =0; i != results.count; i++){ var result = results.result[i]; - $("",{ + $('',{ value: result[searchColumn][0], html: result[searchColumn][0] }).appendTo(list); } - }; + } function search_on_fail(xhr, text_status, errow_thrown) { - alert("associationSearchFailure"); - }; + alert('associationSearchFailure'); + } var queryFilter = $('#associateFilter', form.dialog).val(); ipa_cmd('find', [queryFilter], {}, search_on_win, null, form.manyObj); @@ -209,32 +209,109 @@ function AssociationForm(oneObj, pkey, manyObj, on_success, associatorConstructo }; } -/** - A modfied version of search. It shows the associations for an object. -*/ -function AssociationList(obj, pkey, manyObj, associationColumns, jobj, associationConstructor, method) -{ - var form = this; +function ipa_association_config(spec) { + spec = spec || {}; - this.obj = obj; - this.pkey = pkey; - this.associationColumns = associationColumns; - this.manyObj = manyObj; - this.container = jobj; - this.associationConstructor = associationConstructor; - this.method = method; + var that = {}; - this.refresh = function() { + that.name = spec.name; + that.associator = spec.associator; + that.method = spec.method; + + return that; +} + +function ipa_association_facet(spec) { + + spec = spec || {}; + + var that = ipa_facet(spec); + + that.configs = []; + that.configs_by_name = {}; + + that.other_entity = null; + + that.get_configs = function() { + return that.configs; + }; + + that.get_config = function(name) { + return that.configs_by_name[name]; + }; + + that.add_config = function(config) { + that.configs.push(config); + that.configs_by_name[config.name] = config; + }; + + that.create_config = function(spec) { + var config = ipa_association_config(spec); + that.add_config(config); + return config; + }; + + that.is_dirty = function() { + var pkey = $.bbq.getState(that.entity_name + '-pkey', true) || ''; + var other_entity = $.bbq.getState(that.entity_name + '-enroll', true) || ''; + return pkey != that.pkey || other_entity != that.other_entity; + }; + + that.setup = function(container, unspecified) { + + that.pkey = $.bbq.getState(that.entity_name + '-pkey', true) || ''; + that.other_entity = $.bbq.getState(that.entity_name + '-enroll', true) || ''; + + that.member_attrribute = ipa_get_member_attribute(that.entity_name, that.other_entity); + that.columns = [ + { + 'title': IPA.metadata[that.other_entity].label, + 'column': that.member_attrribute + '_' + that.other_entity + } + ]; + + var config = that.get_config(that.other_entity); + that.associator = config ? config.associator : null; + that.method = config ? config.method : null; + + that.setup_views(container); + + //TODO I18N + var header_message = that.other_entity + '(s) enrolled in ' + + that.entity_name + ' ' + that.pkey; + container.append($('

',{html: header_message }) ); + association_list_create(that.entity_name, container); + container.find('.search-filter').css('display', 'none'); + container.find('.search-buttons').html(''); + + $('', { + type: 'button', + value: 'enroll', + click: function() { + that.show_enrollment_dialog(); + } + }).appendTo(container.find('.search-buttons')); + + var header = $('').appendTo(container.find('.search-table thead:last')); + for (var i =0 ; i != that.columns.length ;i++){ + $('',{ + html: that.columns[i].title + }).appendTo(header); + } + that.refresh(container); + }; + + that.refresh = function(container) { function refresh_on_success(data, text_status, xhr) { - var tbody = form.container.find('.search-table tbody'); + var tbody = container.find('.search-table tbody'); tbody.empty(); - var associationList = data.result.result[form.associationColumns[0].column]; + var associationList = data.result.result[that.columns[0].column]; for (var j = 0; j < associationList.length; j++){ - var row = $("").appendTo(tbody); - for (var k = 0; k < associationColumns.length ;k++){ - var column = form.associationColumns[k].column; - $("",{ + var row = $('').appendTo(tbody); + for (var k = 0; k < that.columns.length ;k++){ + var column = that.columns[k].column; + $('',{ html: data.result.result[column][j] }).appendTo(row); } @@ -242,54 +319,32 @@ function AssociationList(obj, pkey, manyObj, associationColumns, jobj, associati } function refresh_on_error(xhr, text_status, error_thrown) { - var search_results = $('.search-results', jobj).empty(); + var search_results = $('.search-results', container).empty(); search_results.append('

Error: '+error_thrown.name+'

'); search_results.append('

URL: '+this.url+'

'); search_results.append('

'+error_thrown.message+'

'); } - ipa_cmd('show', [this.pkey], {}, refresh_on_success, refresh_on_error, form.obj); - } + ipa_cmd('show', [that.pkey], {}, refresh_on_success, refresh_on_error, that.entity_name); + }; - this.setup = function() { - //TODO I18N - var header_message = manyObj + "(s) enrolled in " + - this.obj + " " + pkey; - this.container.append($("

",{html: header_message }) ); - association_list_create(this.obj, this.container); - this.container.find(".search-filter").css("display", "none"); - this.container.find(".search-buttons").html(""); - $("", { - type: 'button', - value: 'enroll', - click: function() { - form.show_enrollment_dialog(); - } - }).appendTo(this.container.find(".search-buttons")); - var header = $("").appendTo(this.container.find('.search-table thead:last')); - for (var i =0 ; i != associationColumns.length ;i++){ - $("",{ - html: associationColumns[i].title - }).appendTo(header); - } - this.refresh(); - } - - this.show_enrollment_dialog = function() { + that.show_enrollment_dialog = function() { var enrollment_dialog = new AssociationForm( - this.obj, - this.pkey, - this.manyObj, + that.entity_name, + that.pkey, + that.other_entity, function() { - form.refresh(); + that.refresh(); enrollment_dialog.close(); }, - this.associationConstructor, - this.method + that.associator, + that.method ); enrollment_dialog.setup(); - } + }; + + return that; } diff --git a/install/static/details.js b/install/static/details.js index d0688f55d..d4593d82e 100644 --- a/install/static/details.js +++ b/install/static/details.js @@ -25,134 +25,222 @@ /* REQUIRES: ipa.js */ var ipa_details_cache = {}; -var ipa_entity_details_list = {}; +function ipa_details_field(spec) { + + spec = spec || {}; -function ipa_stanza(spec){ var that = {}; + that.name = spec.name; + that.label = spec.label; + that.setup = spec.setup || setup; + that.load = spec.load || load; + that.save = spec.save || save; + + function setup(container, dl, section) { + + var obj_name = container.attr('title'); + var title = this.name; + var label = ''; + var param_info = ipa_get_param_info(obj_name, this.name); + if (param_info) + label = param_info['label']; + if (!label) + label = this.label; + $('
', { + id: this.name, + title: title, + html: label + ':' + }).appendTo(dl); + } + + function load(container, dt, entry_attrs) { + + var obj_name = container.attr('id'); + var multivalue = false; + var hint_span = null; + var dd; + + var param_info = ipa_get_param_info(obj_name, this.name); + if (param_info) { + if (param_info['multivalue'] || param_info['class'] == 'List') + multivalue = true; + var hint = param_info['hint']; + if (hint){ + hint_span = $('',{ + 'class': 'attrhint', + 'html': 'Hint: ' + hint}); + } + } + + var value = entry_attrs[this.name]; + if (value) { + dd = ipa_create_first_dd( + this.name, ipa_create_input(obj_name, this.name, value[0],hint_span) + ); + dt.after(dd); + var last_dd = dd; + for (var i = 1; i < value.length; ++i) { + dd = ipa_create_other_dd( + this.name, ipa_create_input(obj_name, this.name, value[i],hint_span) + ); + last_dd.after(dd); + last_dd = dd; + } + if (multivalue) { + dd = ipa_create_other_dd( + this.name, _ipa_a_add_template.replace('A', this.name) + ); + last_dd.after(dd); + } + } else { + if (multivalue) { + dd = ipa_create_first_dd( + this.name, _ipa_a_add_template.replace('A', this.name) /*.append(hint_span)*/ + ); + dt.after(dd); + } else { + dd = ipa_create_first_dd( + this.name, ipa_create_input(obj_name, this.name, '') /*.append(hint_span)*/ + ); + dt.after(dd); + } + } + } + + function save(container) { + var field = this; + var values = []; + + var dd = $('dd[title='+field.name+']', container); + dd.each(function () { + var input = $('input', $(this)); + if (!input.length) return; + + if (input.is('.strikethrough')) return; + + var value = $.trim(input.val()); + if (!value) value = ''; + + values.push(value); + }); + + return values; + } + + return that; +} + +function ipa_details_section(spec){ + + spec = spec || {}; + + var that = {}; that.name = spec.name || ''; that.label = spec.label || ''; - function input(spec){ - - /*Was ipa_details_field_setup*/ - function setup(container, dl, section) { - - var obj_name = container.attr('title'); - var title = this.name; - var label = ''; - var param_info = ipa_get_param_info(obj_name, this.name); - if (param_info) - label = param_info['label']; - if (!label) - label = this.label; - $('
', { - id: this.name, - title: title, - html: label + ':' - }).appendTo(dl); - } - - /*Was ipa_details_field_load*/ - function load(container, dt, entry_attrs) { - - var obj_name = container.attr('id'); - var multivalue = false; - var hint_span = null; - var dd; - - var param_info = ipa_get_param_info(obj_name, this.name); - if (param_info) { - if (param_info['multivalue'] || param_info['class'] == 'List') - multivalue = true; - var hint = param_info['hint']; - if (hint){ - hint_span = $('',{ - 'class': 'attrhint', - 'html': 'Hint: ' + hint}); - } - } - - var value = entry_attrs[this.name]; - if (value) { - dd = ipa_create_first_dd( - this.name, ipa_create_input(obj_name, this.name, value[0],hint_span) - ); - dt.after(dd); - var last_dd = dd; - for (var i = 1; i < value.length; ++i) { - dd = ipa_create_other_dd( - this.name, ipa_create_input(obj_name, this.name, value[i],hint_span) - ); - last_dd.after(dd); - last_dd = dd; - } - if (multivalue) { - dd = ipa_create_other_dd( - this.name, _ipa_a_add_template.replace('A', this.name) - ); - last_dd.after(dd); - } - } else { - if (multivalue) { - dd = ipa_create_first_dd( - this.name, _ipa_a_add_template.replace('A', this.name) /*.append(hint_span)*/ - ); - dt.after(dd); - } else { - dd = ipa_create_first_dd( - this.name, ipa_create_input(obj_name, this.name, '') /*.append(hint_span)*/ - ); - dt.after(dd); - } - } - } - /*Was ipa_details_field_save*/ - function save(container) { - var field = this; - var values = []; - - var dd = $('dd[title='+field.name+']', container); - dd.each(function () { - var input = $('input', $(this)); - if (!input.length) return; - - if (input.is('.strikethrough')) return; - - var value = $.trim(input.val()); - if (!value) value = ''; - - - values.push(value); - }); - - return values; - } - - that.fields.push(spec); - that.controls[spec.name] = spec; - - if (!spec.setup){ - spec.setup = setup; - } - if (!spec.load){ - spec.load = load; - } - - if (!spec.save){ - spec.save = save; - } - - return that; - }; - that.input = input; that.fields = []; - that.controls={}; + that.fields_by_name = {}; + + that.get_fields = function() { + return that.fields; + }; + + that.get_field = function(name) { + return that.fields_by_name[name]; + }; + + that.add_field = function(field) { + that.fields.push(field); + that.fields_by_name[field.name] = field; + }; + + that.create_field = function(spec) { + var field = ipa_details_field(spec); + that.add_field(field); + return field; + }; + + // Deprecated: Used for backward compatibility only. + function input(spec){ + that.create_field(spec); + return that; + } + + that.input = input; + return that; -}; +} +// Deprecated: Used for backward compatibility only. +function ipa_stanza(spec) { + return ipa_details_section(spec); +} +function ipa_details_facet(spec) { + + spec = spec || {}; + + var that = ipa_facet(spec); + + that.init = spec.init; + that.setup = spec.setup || setup; + + that.sections = []; + that.sections_by_name = {}; + + that.get_sections = function() { + return that.sections; + }; + + that.get_section = function(name) { + return that.sections_by_name[name]; + }; + + that.add_section = function(section) { + that.sections.push(section); + that.sections_by_name[section.name] = section; + }; + + that.create_section = function(spec) { + var section = ipa_stanza(spec); + that.add_section(section); + return section; + }; + + that.is_dirty = function() { + var pkey = $.bbq.getState(that.entity_name + '-pkey', true) || ''; + return pkey != that.pkey; + }; + + function setup(container, unspecified) { + + that.pkey = $.bbq.getState(that.entity_name + '-pkey', true) || ''; + + that.setup_views(container); + ipa_details_create(container, that.sections); + + container.find('.details-reset').click(function() { + ipa_details_reset(container); + return false; + }); + + container.find('.details-update').click(function() { + var pkey_name = IPA.metadata[that.entity_name].primary_key; + ipa_details_update(container, ipa_details_cache[that.entity_name][pkey_name][0]); + return false; + }); + + if (that.pkey||unspecified){ + ipa_details_load(container, that.pkey, null, null); + } + } + + if (that.init) that.init(); + + return that; +} function ipa_make_button(which,text,details_class){ @@ -286,7 +374,8 @@ function ipa_details_update(container, pkey, on_win, on_fail) var modlist = {'all': true, 'setattr': [], 'addattr': []}; var attrs_wo_option = {}; - var sections = ipa_entity_get_details_sections(obj_name); + var facet = ipa_entity_get_details_facet(obj_name); + var sections = facet.get_sections(); for (var i=0; i tags and pair them with newly created
s */ - var sections = ipa_entity_get_details_sections(obj_name); + var facet = ipa_entity_get_details_facet(obj_name); + var sections = facet.get_sections(); for (var i=0; i div.search-controls")) - search_load(container, filter); - }, - - details : function(unspecified) { - var pkey = $.bbq.getState(obj_name + '-pkey', true); - ipa_entity_generate_views(obj_name, container, switch_view); - var sections = ipa_entity_get_details_sections(obj_name); - ipa_details_create(container, sections); - container.find('.details-reset').click(reset_on_click); - container.find('.details-update').click(update_on_click); - if (pkey||unspecified){ - ipa_details_load(container, pkey, null, null); - } - }, - - associate : function facet(unspecified) { - var pkey = $.bbq.getState(obj_name + '-pkey', true) || ''; - var enroll_obj_name = $.bbq.getState(obj_name + '-enroll', true) || ''; - var attr = ipa_get_member_attribute(obj_name, enroll_obj_name); - var columns = [ - { - title: ipa_objs[enroll_obj_name].label, - column: attr + '_' + enroll_obj_name - } - ]; - var association = ipa_entity_association_list[obj_name]; - var association_config = association ? association[enroll_obj_name] : null; - var associator = association_config ? association_config.associator : null; - var method = association_config ? association_config.method : null; - var frm = new AssociationList( - obj_name, pkey, enroll_obj_name, columns, container, - associator, method - ); - ipa_entity_generate_views(obj_name, container, switch_view); - frm.setup(); - }, - - records: function(unspecified) { - records_facet.setup(obj_name, container, switch_view ); - } - - } +function ipa_entity_setup(container, unspecified) { + var entity = this; container.empty(); - var facet = $.bbq.getState(obj_name + '-facet', true) || - unspecified || 'search'; + var facet_name = $.bbq.getState(entity.name + '-facet', true) || unspecified || 'search'; - var facet_setup_function = facet_setups[facet]; - if (facet_setup_function){ - facet_setup_function(unspecified); + var facet = entity.get_facet(facet_name); + if (!facet) return; + + if (IPA.entity_name == entity.name) { + if (entity.facet_name == facet_name) { + if (!facet.is_dirty()) return; + + } else { + entity.facet_name = facet_name; + } + } else { + IPA.entity_name = entity.name; + } + + if (facet.setup) { + facet.setup(container, unspecified); } } -function ipa_entity_generate_views(obj_name, container, switch_view) -{ - var ul = $('
    ', {'class': 'entity-views'}); +function ipa_facet_setup_views(container) { - //TODO for single instance entites, don't display search - ul.append($('
  • ', { - title: 'search', - text: 'Search', - click: switch_view - })); + var facet = this; - ul.append($('
  • ', { - text: 'Details', - title: 'details', - click: switch_view - }).prepend('| ')); + var ul = $('