Browse Source

HUE-8353 [useradmin] Give a compatible name to sync_ldap_users_groups URL view

Romain Rigaux 7 years ago
parent
commit
dbc5ce2968

+ 5 - 4
apps/useradmin/src/useradmin/templates/list_users.mako

@@ -49,10 +49,11 @@ ${layout.menubar(section='users')}
             %endif
 
             % if is_ldap_setup:
-            <a href="${ url('useradmin.views.add_ldap_users') }" class="btn"><i class="fa fa-briefcase"></i> ${_('Add/Sync LDAP user')}</a>
-            <a href="javascript:void(0)" class="btn confirmationModal"
-               data-confirmation-url="${ url('useradmin.views.sync_ldap_users_groups') }${ is_embeddable and '?is_embeddable=true' or ''}"><i
-                class="fa fa-refresh"></i> ${_('Sync LDAP users/groups')}</a>
+              <a href="${ url('useradmin.views.add_ldap_users') }" class="btn"><i class="fa fa-briefcase"></i> ${_('Add/Sync LDAP user')}</a>
+              <a href="javascript:void(0)" class="btn confirmationModal"
+                 data-confirmation-url="${ url('useradmin_views_sync_ldap_users_groups') }${ is_embeddable and '?is_embeddable=true' or ''}">
+                 <i class="fa fa-refresh"></i> ${_('Sync LDAP users/groups')}
+              </a>
             % endif
 
             <a href="http://gethue.com/making-hadoop-accessible-to-your-employees-with-ldap/"

+ 4 - 1
apps/useradmin/src/useradmin/urls.py

@@ -16,13 +16,16 @@
 # limitations under the License.
 
 from django.conf.urls import url
+
 from desktop.lib.django_util import get_username_re_rule, get_groupname_re_rule
+
 from useradmin import views as useradmin_views
 from useradmin import api as useradmin_api
 
 username_re = get_username_re_rule()
 groupname_re = get_groupname_re_rule()
 
+
 urlpatterns = [
   url(r'^$', useradmin_views.list_users, name="useradmin.views.list_users"),
   url(r'^users/?$', useradmin_views.list_users, name="useradmin.views.list_users"),
@@ -32,7 +35,7 @@ urlpatterns = [
   url(r'^users/edit/(?P<username>%s)$' % (username_re,), useradmin_views.edit_user, name="useradmin.views.edit_user"),
   url(r'^users/add_ldap_users$', useradmin_views.add_ldap_users, name="useradmin.views.add_ldap_users"),
   url(r'^users/add_ldap_groups$', useradmin_views.add_ldap_groups, name="useradmin.views.add_ldap_groups"),
-  url(r'^users/sync_ldap_users_groups$', useradmin_views.sync_ldap_users_groups),
+  url(r'^users/sync_ldap_users_groups$', useradmin_views.sync_ldap_users_groups, name="useradmin_views_sync_ldap_users_groups"),
   url(r'^groups/edit/(?P<name>%s)$' % (groupname_re,), useradmin_views.edit_group, name="useradmin.views.edit_group"),
   url(r'^permissions/edit/(?P<app>.+?)/(?P<priv>.+?)/?$', useradmin_views.edit_permission, name="useradmin.views.edit_permission"),
   url(r'^users/new$', useradmin_views.edit_user, name="useradmin.views.edit_user"),