فهرست منبع

[useradmin] Fix ensure home directory name conflict

Romain Rigaux 12 سال پیش
والد
کامیت
1501975579
2فایلهای تغییر یافته به همراه6 افزوده شده و 6 حذف شده
  1. 2 2
      README.rst
  2. 4 4
      apps/useradmin/src/useradmin/views.py

+ 2 - 2
README.rst

@@ -15,8 +15,8 @@ applications. It features:
       * Search app for querying Solr and Solr Cloud
       * Search app for querying Solr and Solr Cloud
       * Job Browser for accessing MapReduce jobs (MR1/MR2-YARN)
       * Job Browser for accessing MapReduce jobs (MR1/MR2-YARN)
       * Job Designer for creating MapReduce/Streaming/Java jobs
       * Job Designer for creating MapReduce/Streaming/Java jobs
-      * A Sqoop2 editor and dashboard
-      * A Zookeeper browser and editor
+      * A Sqoop 2 editor and dashboard
+      * A ZooKeeper browser and editor
 
 
 On top of that, a SDK is available for creating new apps integrated with Hadoop.
 On top of that, a SDK is available for creating new apps integrated with Hadoop.
 
 

+ 4 - 4
apps/useradmin/src/useradmin/views.py

@@ -352,15 +352,15 @@ def sync_ldap_users_groups(request):
   if request.method == 'POST':
   if request.method == 'POST':
     form = SyncLdapUsersGroupsForm(request.POST)
     form = SyncLdapUsersGroupsForm(request.POST)
     if form.is_valid():
     if form.is_valid():
-      ensure_home_directory = form.cleaned_data['ensure_home_directory']
-      sync_ldap_users_and_groups(ensure_home_directory, request.fs)
+      is_ensuring_home_directory = form.cleaned_data['ensure_home_directory']
+      sync_ldap_users_and_groups(is_ensuring_home_directory, request.fs)
       return redirect(reverse(list_users))
       return redirect(reverse(list_users))
   else:
   else:
     form = SyncLdapUsersGroupsForm()
     form = SyncLdapUsersGroupsForm()
 
 
   return render("sync_ldap_users_groups.mako", request, dict(path=request.path, form=form))
   return render("sync_ldap_users_groups.mako", request, dict(path=request.path, form=form))
 
 
-def sync_ldap_users_and_groups(ensure_home_directory=False, fs=None):
+def sync_ldap_users_and_groups(is_ensuring_home_directory=False, fs=None):
   try:
   try:
     users = sync_ldap_users()
     users = sync_ldap_users()
     groups = sync_ldap_groups()
     groups = sync_ldap_groups()
@@ -369,7 +369,7 @@ def sync_ldap_users_and_groups(ensure_home_directory=False, fs=None):
     raise PopupException(_('There was an error when communicating with LDAP'), detail=str(e))
     raise PopupException(_('There was an error when communicating with LDAP'), detail=str(e))
 
 
   # Create home dirs for every user sync'd
   # Create home dirs for every user sync'd
-  if ensure_home_directory:
+  if is_ensuring_home_directory:
     for user in users:
     for user in users:
       try:
       try:
         ensure_home_directory(fs, user.username)
         ensure_home_directory(fs, user.username)