diff options
| -rw-r--r-- | etc/couchdb/default.ini.tpl.in | 2 | ||||
| -rw-r--r-- | share/www/database.html | 4 | ||||
| -rw-r--r-- | share/www/script/couch.js | 2 | ||||
| -rw-r--r-- | share/www/script/futon.browse.js | 8 | ||||
| -rw-r--r-- | share/www/script/jquery.couch.js | 2 | ||||
| -rw-r--r-- | src/couchdb/couch_httpd_view.erl | 6 |
6 files changed, 12 insertions, 12 deletions
diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in index c4710e87..28ab36f2 100644 --- a/etc/couchdb/default.ini.tpl.in +++ b/etc/couchdb/default.ini.tpl.in @@ -49,7 +49,7 @@ _restart = {couch_httpd_misc_handlers, handle_restart_req} [httpd_db_handlers] _view = {couch_httpd_view, handle_view_req} -_slow_view = {couch_httpd_view, handle_slow_view_req} +_temp_view = {couch_httpd_view, handle_temp_view_req} _show = {couch_httpd_show, handle_doc_show_req} _list = {couch_httpd_show, handle_view_list_req} diff --git a/share/www/database.html b/share/www/database.html index 1214e117..77172b0d 100644 --- a/share/www/database.html +++ b/share/www/database.html @@ -40,7 +40,7 @@ specific language governing permissions and limitations under the License. if (page.redirecting) return; $("h1 strong").text(page.db.name); var viewPath = (page.viewName || "_all_docs").replace(/^_design\//, "_view/"); - if (viewPath != "_slow_view" && viewPath != "_design_docs") { + if (viewPath != "_temp_view" && viewPath != "_design_docs") { $("h1 a.raw").attr("href", "/" + encodeURIComponent(page.db.name) + "/" + viewPath); } @@ -118,7 +118,7 @@ specific language governing permissions and limitations under the License. <label>Select view: <select autocomplete="false"> <option value="_all_docs">All documents</option> <option value="_design_docs">Design documents</option> - <option value="_slow_view">Custom query…</option> + <option value="_temp_view">Custom query…</option> </select></label> </div> <ul id="toolbar"> diff --git a/share/www/script/couch.js b/share/www/script/couch.js index e1806d6f..0a2698ab 100644 --- a/share/www/script/couch.js +++ b/share/www/script/couch.js @@ -129,7 +129,7 @@ function CouchDB(name, httpHeaders) { reduceFun = reduceFun.toSource ? reduceFun.toSource() : "(" + reduceFun.toString() + ")"; body.reduce = reduceFun; } - this.last_req = this.request("POST", this.uri + "_slow_view" + encodeOptions(options), { + this.last_req = this.request("POST", this.uri + "_temp_view" + encodeOptions(options), { headers: {"Content-Type": "application/json"}, body: JSON.stringify(body) }); diff --git a/share/www/script/futon.browse.js b/share/www/script/futon.browse.js index 6f90b5a8..f05e92d5 100644 --- a/share/www/script/futon.browse.js +++ b/share/www/script/futon.browse.js @@ -114,7 +114,7 @@ this.viewLanguage = "javascript"; this.db = db; this.isDirty = false; - this.isTempView = viewName == "_slow_view"; + this.isTempView = viewName == "_temp_view"; page = this; var templates = { @@ -199,7 +199,7 @@ } $("#language").change(updateDirtyState); }); - } else if (viewName == "_slow_view") { + } else if (viewName == "_temp_view") { page.viewLanguage = $.cookies.get(db.name + ".language", page.viewLanguage); page.updateViewEditor( $.cookies.get(db.name + ".map", templates[page.viewLanguage]), @@ -266,7 +266,7 @@ } }); if (!viewName.match(/^_design\//)) { - $.each(["_all_docs", "_design_docs", "_slow_view"], function(idx, name) { + $.each(["_all_docs", "_design_docs", "_temp_view"], function(idx, name) { if (viewName == name) { select[0].options[idx].selected = true; } @@ -577,7 +577,7 @@ $("#switch select")[0].selectedIndex = 0; db.allDocs(options); } else { - if (viewName == "_slow_view") { + if (viewName == "_temp_view") { $("#viewcode").show().removeClass("collapsed"); var mapFun = $("#viewcode_map").val(); $.cookies.set(db.name + ".map", mapFun); diff --git a/share/www/script/jquery.couch.js b/share/www/script/jquery.couch.js index c92be220..b4566e3a 100644 --- a/share/www/script/jquery.couch.js +++ b/share/www/script/jquery.couch.js @@ -249,7 +249,7 @@ body.reduce = reduceFun; } $.ajax({ - type: "POST", url: this.uri + "_slow_view" + encodeOptions(options), + type: "POST", url: this.uri + "_temp_view" + encodeOptions(options), contentType: "application/json", data: toJSON(body), dataType: "json", complete: function(req) { diff --git a/src/couchdb/couch_httpd_view.erl b/src/couchdb/couch_httpd_view.erl index 06d89a59..a6174a29 100644 --- a/src/couchdb/couch_httpd_view.erl +++ b/src/couchdb/couch_httpd_view.erl @@ -13,7 +13,7 @@ -module(couch_httpd_view). -include("couch_db.hrl"). --export([handle_view_req/2,handle_slow_view_req/2]). +-export([handle_view_req/2,handle_temp_view_req/2]). -export([parse_view_query/1,parse_view_query/2,make_view_fold_fun/5, finish_view_fold/3, view_row_obj/3]). @@ -58,7 +58,7 @@ handle_view_req(#httpd{method='POST',path_parts=[_,_, Id, ViewName]}=Req, Db) -> handle_view_req(Req, _Db) -> send_method_not_allowed(Req, "GET,POST,HEAD"). -handle_slow_view_req(#httpd{method='POST'}=Req, Db) -> +handle_temp_view_req(#httpd{method='POST'}=Req, Db) -> QueryArgs = parse_view_query(Req), case couch_httpd:primary_header_value(Req, "content-type") of @@ -80,7 +80,7 @@ handle_slow_view_req(#httpd{method='POST'}=Req, Db) -> output_reduce_view(Req, View, QueryArgs, Keys) end; -handle_slow_view_req(Req, _Db) -> +handle_temp_view_req(Req, _Db) -> send_method_not_allowed(Req, "POST"). output_map_view(Req, View, Db, QueryArgs, nil) -> |