Merge pull request #4579 from sstrigler/fix_roster_webadmin

fix (webadmin): don't crash in make_table for regular cmd buttons

Author: badlop

src/ejabberd_web_admin.erl

@@ -1986,7 +1986,9 @@ filter_results(_, Result) ->
 
 format_result(presentation, _ExecRes, PresentationEls, _ArgumentsEls, _ResultEls) ->
     ?XAE(<<"p">>, [{<<"class">>, <<"api">>}], PresentationEls);
-format_result(button, _ExecRes, _PresentationEls, [Button], ResultEls) ->
+format_result(button, _ExecRes, _PresentationEls, [Button], _ResultEls) ->
+    Button;
+format_result(action_button, _ExecRes, _PresentationEls, [Button], ResultEls) ->
     {ResultEls, Button};
 format_result(result,
               _ExecRes,
@@ -3009,7 +3011,7 @@ action_button_allowed(Name, Request, BaseArguments, Options, Cmd) ->
                                BaseArguments,
                                []),
     ResultEls = action_button_result_el(ExecRes, Request#request.lang, Name),
-    format_result(button, ExecRes, PresentationEls, ArgumentsEls, ResultEls).
+    format_result(action_button, ExecRes, PresentationEls, ArgumentsEls, ResultEls).
 
 action_button_result_el(not_executed, _L, _N) ->
     [];

test/webadmin_tests.erl

@@ -31,6 +31,7 @@ send_recv/2, put_event/2, get_event/1]).
 -include("suite.hrl").
 -include_lib("stdlib/include/assert.hrl").
 -include("mod_invites.hrl").
+-include("mod_roster.hrl").
 
 %%%===================================================================
 %%% API
@@ -43,6 +44,7 @@ single_cases() ->
      [single_test(login_page),
       single_test(welcome_page),
       single_test(user_page),
+      single_test(user_roster_page),
       single_test(adduser),
       single_test(changepassword),
       single_test(removeuser),
@@ -71,6 +73,17 @@ user_page(Config) ->
 		  Body),
     ?match({_, _}, binary:match(Body, <<"<title>ejabberd Web Admin">>)).
 
+user_roster_page(Config) ->
+    Server = ?config(server, Config),
+    User = ?config(user, Config),
+    mod_roster:set_roster(#roster{us = {User, Server}, jid = {<<"admin">>, Server, <<>>}}),
+    URL = "server/" ++ binary_to_list(Server) ++ "/user/" ++ binary_to_list(misc:url_encode(User)) ++ "/roster/",
+    Body = ?match({ok, {{"HTTP/1.1", 200, _}, _, Body}},
+		  httpc:request(get, {page(Config, URL), [basic_auth_header(Config)]}, [],
+				[{body_format, binary}]),
+		  Body),
+    ?match({_, _}, binary:match(Body, <<"<title>ejabberd Web Admin">>)).
+
 adduser(Config) ->
     User = <<"userwebadmin-", (?config(user, Config))/binary>>,
     Server = ?config(server, Config),