IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed inconsistent required/optional attributes.

Browse Source 
The dialogs and details pages have been modified to use the * symbol
to mark required fields. The automount map and the DNS zone dialogs
have been modified to update the required fields according to the
input type.

Ticket #1696, #1973
This commit is contained in:
Endi S. Dewata
2011-10-19 18:11:09 -02:00
parent b4ebcad0e0
commit 09f3e9869a
15 changed files with 381 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
install/ui/widget.js
View File

@@ -24,6 +24,7 @@
/* REQUIRES: ipa.js */
IPA.checkbox_column_width = 22;
IPA.required_indicator = '*';
IPA.widget = function(spec) {
@@ -40,7 +41,9 @@ IPA.widget = function(spec) {
that.disabled = spec.disabled;
that.hidden = spec.hidden;
that.optional = spec.optional || false;
// override the required flag in metadata
that.required = spec.required;
// read_only is set when widget is created
that.read_only = spec.read_only;
@@ -51,7 +54,7 @@ IPA.widget = function(spec) {
that.width = spec.width;
that.height = spec.height;
that.undo = typeof spec.undo == 'undefined' ? true : spec.undo;
that.undo = spec.undo === undefined ? true : spec.undo;
that.join = spec.join;
that.param_info = spec.param_info;
@@ -129,14 +132,38 @@ IPA.widget = function(spec) {
}).appendTo(container);
};
that.check_required = function(){
that.create_required = function(container) {
that.required_indicator = $('<span/>', {
'class': 'required-indicator',
text: IPA.required_indicator,
style: 'display: none; float: right;'
}).appendTo(container);
};
that.is_required = function() {
if (that.read_only) return false;
if (!that.writable) return false;
if (that.required !== undefined) return that.required;
return that.param_info && that.param_info.required;
};
that.set_required = function(required) {
that.required = required;
that.update_required();
};
that.update_required = function() {
if (that.required_indicator) {
that.required_indicator.css('display', that.is_required() ? 'inline' : 'none');
}
};
that.check_required = function() {
var values = that.save();
if (!values || !values.length || values[0] === '' ) {
if (that.param_info &&
that.param_info.required &&
!that.optional &&
!that.read_only &&
that.writable) {
if (!values || !values.length || values[0] === '') {
if (that.is_required()) {
that.valid = false;
that.show_error(IPA.messages.widget.validation.required);
return false;
@@ -265,6 +292,7 @@ IPA.widget = function(spec) {
};
that.reset = function() {
that.update_required();
that.update();
that.validate();
that.set_dirty(false);
@@ -838,6 +866,11 @@ IPA.checkbox_widget = function (spec) {
that.input.attr('checked', value);
};
// a checkbox will always have a value, so it's never required
that.is_required = function() {
return false;
};
that.checkbox_save = that.save;
that.checkbox_load = that.load;
@@ -1006,6 +1039,11 @@ IPA.radio_widget = function(spec) {
}
};
// a radio will always have a value, so it's never required
that.is_required = function() {
return false;
};
// methods that should be invoked by subclasses
that.radio_create = that.create;
that.radio_save = that.save;