diff options
| author | Badlop <badlop@process-one.net> | 2013-10-01 23:23:01 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2013-10-01 23:23:01 +0200 |
| commit | cd0381bab5c83f8fc7a6a81412f201d85a3d4ffa (patch) | |
| tree | 48d7de895d66ca5b92bdf0454027aa1d16bee6fe | |
| parent | update default version to 13.10 (diff) | |
Fix display ACLs in WebAdmin
| -rw-r--r-- | src/ejabberd_web_admin.erl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl index 4506455bd..02f653f58 100644 --- a/src/ejabberd_web_admin.erl +++ b/src/ejabberd_web_admin.erl @@ -1004,24 +1004,24 @@ acls_to_xhtml(ACLs) -> [?INPUT(<<"text">>, <<"namenew">>, <<"">>)])] ++ acl_spec_to_xhtml(<<"new">>, {user, <<"">>})))]))]). +acl_spec_to_text({user, {U, S}}) -> + {user, <<U/binary, "@", S/binary>>}; acl_spec_to_text({user, U}) -> {user, U}; acl_spec_to_text({server, S}) -> {server, S}; -acl_spec_to_text({user, U, S}) -> - {user, <<U/binary, "@", S/binary>>}; +acl_spec_to_text({user_regexp, {RU, S}}) -> + {user_regexp, <<RU/binary, "@", S/binary>>}; acl_spec_to_text({user_regexp, RU}) -> {user_regexp, RU}; -acl_spec_to_text({user_regexp, RU, S}) -> - {user_regexp, <<RU/binary, "@", S/binary>>}; acl_spec_to_text({server_regexp, RS}) -> {server_regexp, RS}; -acl_spec_to_text({node_regexp, RU, RS}) -> +acl_spec_to_text({node_regexp, {RU, RS}}) -> {node_regexp, <<RU/binary, "@", RS/binary>>}; -acl_spec_to_text({user_glob, RU}) -> {user_glob, RU}; -acl_spec_to_text({user_glob, RU, S}) -> +acl_spec_to_text({user_glob, {RU, S}}) -> {user_glob, <<RU/binary, "@", S/binary>>}; +acl_spec_to_text({user_glob, RU}) -> {user_glob, RU}; acl_spec_to_text({server_glob, RS}) -> {server_glob, RS}; -acl_spec_to_text({node_glob, RU, RS}) -> +acl_spec_to_text({node_glob, {RU, RS}}) -> {node_glob, <<RU/binary, "@", RS/binary>>}; acl_spec_to_text(all) -> {all, <<"">>}; acl_spec_to_text(Spec) -> {raw, term_to_string(Spec)}. |