Browse Source

HUE-6312 [useradmin] Add error notifications on Hue 4 for sync ldap user

Enrico Berti 8 years ago
parent
commit
59fe235

+ 8 - 3
apps/useradmin/src/useradmin/templates/add_ldap_users.mako

@@ -49,9 +49,9 @@ ${ layout.menubar(section='users') }
       <br/>
       <div class="form-actions">
         % if username:
-          <input type="submit" class="btn btn-primary" value="${_('Update user')}"/>
+          <input type="submit" class="btn btn-primary disable-feedback" value="${_('Update user')}"/>
         % else:
-          <input type="submit" class="btn btn-primary" value="${_('Add/Sync user')}"/>
+          <input type="submit" class="btn btn-primary disable-feedback" value="${_('Add/Sync user')}"/>
         % endif
         <a href="${ url('useradmin.views.list_users') }" class="btn">${_('Cancel')}</a>
       </div>
@@ -73,7 +73,10 @@ ${ layout.menubar(section='users') }
     $addLdapUsersComponents.find('#syncForm').ajaxForm({
       dataType:  'json',
       success: function(data) {
-        if (data && data.status === 0){
+        if (data && data.status == -1) {
+          renderUseradminErrors(data.errors);
+        }
+        else if (data && data.status === 0) {
           huePubSub.publish('open.link', '${ url('useradmin.views.list_users') }');
           $.jHueNotify.info("${ _('User added/synced correctly') }");
         }
@@ -83,6 +86,8 @@ ${ layout.menubar(section='users') }
   });
 </script>
 
+${layout.commons()}
+
 %if not is_embeddable:
 ${ commonfooter(request, messages) | n,unicode }
 %endif

+ 1 - 1
apps/useradmin/src/useradmin/templates/edit_permissions.mako

@@ -58,7 +58,7 @@ ${layout.menubar(section='permissions')}
       <br/>
 
       <div class="form-actions">
-        <input type="submit" class="btn btn-primary" value="${_('Update permission')}"/>
+        <input type="submit" class="btn btn-primary disable-feedback" value="${_('Update permission')}"/>
         % if is_embeddable:
           <input type="hidden" value="true" name="is_embeddable" />
         % endif

+ 5 - 1
apps/useradmin/src/useradmin/views.py

@@ -587,7 +587,11 @@ def add_ldap_users(request):
   else:
     form = AddLdapUsersForm()
 
-  return render('add_ldap_users.mako', request, dict(form=form, is_embeddable=is_embeddable))
+  if request.method == 'POST' and is_embeddable:
+    return JsonResponse(
+      {'status': -1, 'errors': [{'id': f.id_for_label, 'message': f.errors} for f in form if f.errors]})
+  else:
+    return render('add_ldap_users.mako', request, dict(form=form, is_embeddable=is_embeddable))
 
 
 def add_ldap_groups(request):