summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Avdey <eiri@eiri.ca>2017-07-07 16:53:18 -0300
committerNick Vatamaniuc <nickva@users.noreply.github.com>2017-07-13 12:28:15 -0400
commit022925aefb8bbdc9ff818beff4c6f37382f1f248 (patch)
tree2cfb9f20862e6ff7014b078a40f4bc94bb4010ce
parent6d9673cbbafec2ec07c63eef2c1ed7f5b75f384e (diff)
downloadcouchdb-022925aefb8bbdc9ff818beff4c6f37382f1f248.tar.gz
Send user_ctx to fabric's open_doc
-rw-r--r--src/mango/src/mango_httpd.erl3
-rw-r--r--src/mango/src/mango_util.erl6
2 files changed, 7 insertions, 2 deletions
diff --git a/src/mango/src/mango_httpd.erl b/src/mango/src/mango_httpd.erl
index a08827649..5bc61f57a 100644
--- a/src/mango/src/mango_httpd.erl
+++ b/src/mango/src/mango_httpd.erl
@@ -85,7 +85,8 @@ handle_index_req(#httpd{method='POST', path_parts=[_, _]}=Req, Db) ->
{ok, Opts} = mango_opts:validate_idx_create(chttpd:json_body_obj(Req)),
{ok, Idx0} = mango_idx:new(Db, Opts),
{ok, Idx} = mango_idx:validate_new(Idx0, Db),
- {ok, DDoc} = mango_util:load_ddoc(Db, mango_idx:ddoc(Idx)),
+ DbOpts = [{user_ctx, Req#httpd.user_ctx}, deleted, ejson_body],
+ {ok, DDoc} = mango_util:load_ddoc(Db, mango_idx:ddoc(Idx), DbOpts),
Id = Idx#idx.ddoc,
Name = Idx#idx.name,
Status = case mango_idx:add(DDoc, Idx) of
diff --git a/src/mango/src/mango_util.erl b/src/mango/src/mango_util.erl
index c3513dced..a7347178e 100644
--- a/src/mango/src/mango_util.erl
+++ b/src/mango/src/mango_util.erl
@@ -17,6 +17,7 @@
open_doc/2,
open_ddocs/1,
load_ddoc/2,
+ load_ddoc/3,
defer/3,
do_defer/3,
@@ -104,7 +105,10 @@ open_ddocs(Db) ->
load_ddoc(Db, DDocId) ->
- case open_doc(Db, DDocId, [deleted, ejson_body]) of
+ load_ddoc(Db, DDocId, [deleted, ejson_body]).
+
+load_ddoc(Db, DDocId, DbOpts) ->
+ case open_doc(Db, DDocId, DbOpts) of
{ok, Doc} ->
{ok, check_lang(Doc)};
not_found ->