You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2017/07/13 16:28:21 UTC
[couchdb] 03/04: Send user_ctx to fabric's open_doc
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 022925aefb8bbdc9ff818beff4c6f37382f1f248
Author: Eric Avdey <ei...@eiri.ca>
AuthorDate: Fri Jul 7 16:53:18 2017 -0300
Send user_ctx to fabric's open_doc
---
src/mango/src/mango_httpd.erl | 3 ++-
src/mango/src/mango_util.erl | 6 +++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/mango/src/mango_httpd.erl b/src/mango/src/mango_httpd.erl
index a088276..5bc61f5 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 c3513dc..a734717 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 ->
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.