summaryrefslogtreecommitdiffstats
path: root/ipa-server
diff options
context:
space:
mode:
authorKevin McCarthy <kmccarth@redhat.com>2007-10-01 11:26:22 -0700
committerKevin McCarthy <kmccarth@redhat.com>2007-10-01 11:26:22 -0700
commit59ee94e378e61e6f59b221a8037815f4f6f829f1 (patch)
treea8f9e2bbfad17f5bbf25210bf5d26be42c485b54 /ipa-server
parentdbf8c1aeb98c730b7f4a83bfc15062040e331083 (diff)
downloadfreeipa-59ee94e378e61e6f59b221a8037815f4f6f829f1.tar.gz
freeipa-59ee94e378e61e6f59b221a8037815f4f6f829f1.tar.xz
freeipa-59ee94e378e61e6f59b221a8037815f4f6f829f1.zip
Allow group selection on the create user page.
Diffstat (limited to 'ipa-server')
-rw-r--r--ipa-server/ipa-gui/ipagui/controllers.py84
-rw-r--r--ipa-server/ipa-gui/ipagui/forms/user.py4
-rw-r--r--ipa-server/ipa-gui/ipagui/static/javascript/dynamicedit.js15
-rw-r--r--ipa-server/ipa-gui/ipagui/templates/groupeditform.kid15
-rw-r--r--ipa-server/ipa-gui/ipagui/templates/usereditform.kid15
-rw-r--r--ipa-server/ipa-gui/ipagui/templates/usernew.kid2
-rw-r--r--ipa-server/ipa-gui/ipagui/templates/usernewform.kid88
7 files changed, 176 insertions, 47 deletions
diff --git a/ipa-server/ipa-gui/ipagui/controllers.py b/ipa-server/ipa-gui/ipagui/controllers.py
index c770f5c02..36264351d 100644
--- a/ipa-server/ipa-gui/ipagui/controllers.py
+++ b/ipa-server/ipa-gui/ipagui/controllers.py
@@ -116,7 +116,7 @@ class Root(controllers.RootController):
if tg_errors:
turbogears.flash("There was a problem with the form!")
- return dict(form=user_new_form)
+ return dict(form=user_new_form, user={})
@expose()
@identity.require(identity.not_anonymous())
@@ -130,8 +130,12 @@ class Root(controllers.RootController):
tg_errors, kw = self.usercreatevalidate(**kw)
if tg_errors:
- return dict(form=user_new_form, tg_template='ipagui.templates.usernew')
+ return dict(form=user_new_form, user=kw,
+ tg_template='ipagui.templates.usernew')
+ #
+ # Update the user itself
+ #
try:
new_user = ipa.user.User()
new_user.setValue('uid', kw.get('uid'))
@@ -143,15 +147,67 @@ class Root(controllers.RootController):
new_user.setValue('nsAccountLock', 'true')
rv = client.add_user(new_user)
- turbogears.flash("%s added!" % kw['uid'])
- raise turbogears.redirect('/usershow', uid=kw['uid'])
except ipaerror.exception_for(ipaerror.LDAP_DUPLICATE):
turbogears.flash("Person with login '%s' already exists" %
kw.get('uid'))
- return dict(form=user_new_form, tg_template='ipagui.templates.usernew')
+ return dict(form=user_new_form, user=kw,
+ tg_template='ipagui.templates.usernew')
except ipaerror.IPAError, e:
turbogears.flash("User add failed: " + str(e))
- return dict(form=user_new_form, tg_template='ipagui.templates.usernew')
+ return dict(form=user_new_form, user=kw,
+ tg_template='ipagui.templates.usernew')
+
+ #
+ # NOTE: from here on, the user account now exists.
+ # on any error, we redirect to the _edit_ user page.
+ # this code does data setup, similar to useredit()
+ #
+ user = client.get_user_by_uid(kw['uid'], user_fields)
+ user_dict = user.toDict()
+
+ user_groups_dicts = []
+ user_groups_data = b64encode(dumps(user_groups_dicts))
+
+ # store a copy of the original user for the update later
+ user_data = b64encode(dumps(user_dict))
+ user_dict['user_orig'] = user_data
+ user_dict['user_groups_data'] = user_groups_data
+
+ # preserve group add info in case of errors
+ user_dict['dnadd'] = kw.get('dnadd')
+ user_dict['dn_to_info_json'] = kw.get('dn_to_info_json')
+
+ #
+ # Password change
+ # TODO
+ #
+
+ #
+ # Add groups
+ #
+ failed_adds = []
+ try:
+ dnadds = kw.get('dnadd')
+ if dnadds != None:
+ if not(isinstance(dnadds,list) or isinstance(dnadds,tuple)):
+ dnadds = [dnadds]
+ failed_adds = client.add_groups_to_user(
+ utf8_encode_values(dnadds), user.dn)
+ kw['dnadd'] = failed_adds
+ except ipaerror.IPAError, e:
+ failed_adds = dnadds
+
+ if len(failed_adds) > 0:
+ message = "Person successfully updated.<br />"
+ message += "There was an error adding groups.<br />"
+ message += "Failures have been preserved in the add/remove lists."
+ turbogears.flash(message)
+ return dict(form=user_edit_form, user=user_dict,
+ user_groups=user_groups_dicts,
+ tg_template='ipagui.templates.useredit')
+
+ turbogears.flash("%s added!" % kw['uid'])
+ raise turbogears.redirect('/usershow', uid=kw['uid'])
@expose("ipagui.templates.dynamiceditsearch")
@identity.require(identity.not_anonymous())
@@ -227,6 +283,7 @@ class Root(controllers.RootController):
tg_template='ipagui.templates.useredit')
password_change = False
+ user_modified = False
#
# Update the user itself
@@ -262,6 +319,7 @@ class Root(controllers.RootController):
# need to make sure a subsequent submit doesn't try to update
# the user again.
#
+ user_modified = True
kw['user_orig'] = b64encode(dumps(new_user.toDict()))
except ipaerror.exception_for(ipaerror.LDAP_EMPTY_MODLIST), e:
# could be a password change
@@ -299,10 +357,7 @@ class Root(controllers.RootController):
utf8_encode_values(dnadds), new_user.dn)
kw['dnadd'] = failed_adds
except ipaerror.IPAError, e:
- turbogears.flash("Group update failed: " + str(e))
- return dict(form=user_edit_form, user=kw,
- user_groups=user_groups_dicts,
- tg_template='ipagui.templates.useredit')
+ failed_adds = dnadds
#
# Remove groups
@@ -317,14 +372,15 @@ class Root(controllers.RootController):
utf8_encode_values(dndels), new_user.dn)
kw['dndel'] = failed_dels
except ipaerror.IPAError, e:
- turbogears.flash("Group update failed: " + str(e))
- return dict(form=user_edit_form, user=kw,
- user_groups=user_groups_dicts,
- tg_template='ipagui.templates.useredit')
+ failed_dels = dndels
if (len(failed_adds) > 0) or (len(failed_dels) > 0):
message = "There was an error updating groups.<br />"
message += "Failures have been preserved in the add/remove lists."
+ if user_modified:
+ message = "User Details successfully updated.<br />" + message
+ if password_change:
+ message = "User password successfully updated.<br />" + message
turbogears.flash(message)
return dict(form=user_edit_form, user=kw,
user_groups=user_groups_dicts,
diff --git a/ipa-server/ipa-gui/ipagui/forms/user.py b/ipa-server/ipa-gui/ipagui/forms/user.py
index 561c7ef18..6211c9ff3 100644
--- a/ipa-server/ipa-gui/ipagui/forms/user.py
+++ b/ipa-server/ipa-gui/ipagui/forms/user.py
@@ -46,7 +46,9 @@ class UserNewForm(widgets.Form):
params = ['user']
fields = [UserFields.uid, UserFields.givenname,
- UserFields.sn, UserFields.mail]
+ UserFields.sn, UserFields.mail,
+ UserFields.dn_to_info_json,
+ ]
validator = UserNewValidator()
diff --git a/ipa-server/ipa-gui/ipagui/static/javascript/dynamicedit.js b/ipa-server/ipa-gui/ipagui/static/javascript/dynamicedit.js
index b25fb6c4a..05c22998a 100644
--- a/ipa-server/ipa-gui/ipagui/static/javascript/dynamicedit.js
+++ b/ipa-server/ipa-gui/ipagui/static/javascript/dynamicedit.js
@@ -169,3 +169,18 @@ function preSubmit() {
$('form_dn_to_info_json').value = json;
return true;
}
+
+function enterDoSearch(e) {
+ var keyPressed;
+ if (window.event) {
+ keyPressed = window.event.keyCode;
+ } else {
+ keyPressed = e.which;
+ }
+
+ if (keyPressed == 13) {
+ return doSearch();
+ } else {
+ return true;
+ }
+}
diff --git a/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid b/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid
index ef33ec337..df1f0ccbb 100644
--- a/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid
@@ -24,21 +24,6 @@ from ipagui.helpers import ipahelper
}
}
- function enterDoSearch(e) {
- var keyPressed;
- if (window.event) {
- keyPressed = window.event.keyCode;
- } else {
- keyPressed = e.which;
- }
-
- if (keyPressed == 13) {
- return doSearch();
- } else {
- return true;
- }
- }
-
function doSearch() {
$('searchresults').update("Searching...");
new Ajax.Updater('searchresults',
diff --git a/ipa-server/ipa-gui/ipagui/templates/usereditform.kid b/ipa-server/ipa-gui/ipagui/templates/usereditform.kid
index 36c65fb16..64d28f634 100644
--- a/ipa-server/ipa-gui/ipagui/templates/usereditform.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/usereditform.kid
@@ -33,21 +33,6 @@ from ipagui.helpers import ipahelper
}
}
- function enterDoSearch(e) {
- var keyPressed;
- if (window.event) {
- keyPressed = window.event.keyCode;
- } else {
- keyPressed = e.which;
- }
-
- if (keyPressed == 13) {
- return doSearch();
- } else {
- return true;
- }
- }
-
function doSearch() {
$('searchresults').update("Searching...");
new Ajax.Updater('searchresults',
diff --git a/ipa-server/ipa-gui/ipagui/templates/usernew.kid b/ipa-server/ipa-gui/ipagui/templates/usernew.kid
index 37f5bb449..ee5d0fcd5 100644
--- a/ipa-server/ipa-gui/ipagui/templates/usernew.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/usernew.kid
@@ -8,6 +8,6 @@
<body>
<h2>Add Person</h2>
- ${form.display(action="usercreate")}
+ ${form.display(action="usercreate", value=user)}
</body>
</html>
diff --git a/ipa-server/ipa-gui/ipagui/templates/usernewform.kid b/ipa-server/ipa-gui/ipagui/templates/usernewform.kid
index 0c1ff86b5..a8bd991d2 100644
--- a/ipa-server/ipa-gui/ipagui/templates/usernewform.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/usernewform.kid
@@ -1,6 +1,41 @@
<div xmlns:py="http://purl.org/kid/ns#"
class="simpleroster">
- <form action="${action}" name="${name}" method="${method}" class="tableform">
+ <form action="${action}" name="${name}" method="${method}" class="tableform"
+ onsubmit="preSubmit()">
+
+<?python
+from ipagui.helpers import ipahelper
+?>
+
+ <script type="text/javascript" charset="utf-8"
+ src="${tg.url('/static/javascript/dynamicedit.js')}"></script>
+
+ <?python searchurl = tg.url('/useredit_search') ?>
+
+ <script type="text/javascript">
+ function doSearch() {
+ $('searchresults').update("Searching...");
+ new Ajax.Updater('searchresults',
+ '${searchurl}',
+ { asynchronous:true,
+ parameters: { criteria: $('criteria').value },
+ evalScripts: true });
+ return false;
+ }
+
+ // override dynamicedit.js version
+ // we don't need to show [group] nor italize groups
+ function renderMemberInfo(newdiv, info) {
+ if (info.type == "group") {
+ newdiv.appendChild(document.createTextNode(
+ info.name.escapeHTML() + " "));
+ }
+ }
+ </script>
+
+ <div py:for="field in hidden_fields"
+ py:replace="field.display(value_for(field), **params_for(field))"
+ />
<div class="formsection">Identity Details</div>
<table class="formtable" cellpadding="2" cellspacing="0" border="0">
@@ -181,6 +216,28 @@
</tr>
</table>
+ <div style="clear:both">
+ <div class="formsection">Add Groups</div>
+
+ <div class="floatlist">
+ <div class="floatheader">To Add:</div>
+ <div id="newmembers">
+ </div>
+ </div>
+
+ <div>
+ <div id="search">
+ <input id="criteria" type="text" name="criteria"
+ onkeypress="return enterDoSearch(event);" />
+ <input type="button" value="Find"
+ onclick="return doSearch();"
+ />
+ </div>
+ <div id="searchresults">
+ </div>
+ </div>
+ </div>
+
<table class="formtable" cellpadding="2" cellspacing="0" border="0">
<tr>
<th></th>
@@ -192,4 +249,33 @@
</table>
</form>
+
+ <script type="text/javascript">
+ /*
+ * This section restores the contents of the add and remove lists
+ * dynamically if we have to refresh the page
+ */
+ if ($('form_dn_to_info_json').value != "") {
+ dn_to_info_hash = new Hash($('form_dn_to_info_json').value.evalJSON());
+ }
+ </script>
+
+ <?python
+ dnadds = value.get('dnadd', [])
+ if not(isinstance(dnadds,list) or isinstance(dnadds,tuple)):
+ dnadds = [dnadds]
+ ?>
+
+ <script py:for="dnadd in dnadds">
+ <?python
+ dnadd_esc = ipahelper.javascript_string_escape(dnadd)
+ ?>
+ var dn = "${dnadd_esc}";
+ var info = dn_to_info_hash[dn];
+ var newdiv = addmember(dn, info);
+ if (newdiv != null) {
+ newdiv.style.display = 'block';
+ }
+ </script>
+
</div>