You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2014/11/25 17:39:47 UTC
fauxton commit: updated refs/heads/master to f4fbeec
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 008a70b05 -> f4fbeec10
Fix URL paths for Views to be _view not _views
This changes the URL paths for Views within Fauxton for compatibility
with the API URLs.To test, just create/edit a View and confirm the URL
ends with /_view/theViewName not _views/theViewName
Closes COUCHDB-2415
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/f4fbeec1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/f4fbeec1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/f4fbeec1
Branch: refs/heads/master
Commit: f4fbeec1064de3f120d56d8c2c8eb099215ca306
Parents: 008a70b
Author: Benjamin Keen <be...@gmail.com>
Authored: Tue Nov 18 10:22:36 2014 -0800
Committer: Benjamin Keen <be...@gmail.com>
Committed: Tue Nov 25 08:39:03 2014 -0800
----------------------------------------------------------------------
app/addons/documents/routes-documents.js | 2 +-
app/addons/documents/templates/index_menu_item.html | 7 +++----
app/addons/documents/views-index.js | 2 +-
app/addons/documents/views-sidebar.js | 11 ++++++-----
4 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f4fbeec1/app/addons/documents/routes-documents.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/routes-documents.js b/app/addons/documents/routes-documents.js
index 1fd7232..9abbb8e 100644
--- a/app/addons/documents/routes-documents.js
+++ b/app/addons/documents/routes-documents.js
@@ -54,7 +54,7 @@ function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases, Resou
route: "allDocs",
roles: ["fx_loggedIn"]
},
- "database/:database/_design/:ddoc/_views/:view": {
+ "database/:database/_design/:ddoc/_view/:view": {
route: "viewFn",
roles: ['fx_loggedIn']
},
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f4fbeec1/app/addons/documents/templates/index_menu_item.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/index_menu_item.html b/app/addons/documents/templates/index_menu_item.html
index 434a02a..f7f9e57 100644
--- a/app/addons/documents/templates/index_menu_item.html
+++ b/app/addons/documents/templates/index_menu_item.html
@@ -1,4 +1,4 @@
-<!--
+<%/*
Licensed under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License. You may obtain a copy of
the License at
@@ -10,7 +10,7 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations under
the License.
--->
+*/%>
<a class="js-toggle-<%-ddocType%> accordion-header js-collapse-toggle" data-toggle="collapse" data-target="#<%- removeSpecialCharacters(ddoc) + ddocType %>" id="nav-design-function-<%= removeSpecialCharacters(ddoc) + ddocType %>">
<div class="fonticon-play"></div>
<span class="<%- icon %> fonticon"></span>
@@ -19,10 +19,9 @@ the License.
<ul class="accordion-body collapse" id="<%- removeSpecialCharacters(ddoc) + ddocType %>">
<% _.each(collection, function (item, index) { %>
<li>
- <a data-ddoctype="<%- ddocType %>" id="<%- removeSpecialCharacters(ddoc) %>_<%- removeSpecialCharacters(index) %>" href="#/database/<%- safeURL(database) %>/_design/<%= safeURL(ddoc)%>/_<%-ddocType%>/<%= safeURL(index) %>" class="toggle-view">
+ <a data-ddoctype="<%- ddocType %>" id="<%- removeSpecialCharacters(ddoc) %>_<%- removeSpecialCharacters(index) %>" href="#/database/<%- safeURL(database) %>/_design/<%= safeURL(ddoc)%>/<%-urlFolder%>/<%= safeURL(index) %>" class="toggle-view">
<%- index %>
</a>
</li>
<% }); %>
</ul>
-
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f4fbeec1/app/addons/documents/views-index.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views-index.js b/app/addons/documents/views-index.js
index 128be04..6fda62c 100644
--- a/app/addons/documents/views-index.js
+++ b/app/addons/documents/views-index.js
@@ -187,7 +187,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, QueryOption
});
if (that.newView || viewNameChange) {
- var fragment = '/database/' + that.database.safeID() +'/' + ddoc.safeID() + '/_views/' + app.utils.safeURLName(viewName);
+ var fragment = '/database/' + that.database.safeID() +'/' + ddoc.safeID() + '/_view/' + app.utils.safeURLName(viewName);
FauxtonAPI.navigate(fragment);
that.newView = false;
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f4fbeec1/app/addons/documents/views-sidebar.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views-sidebar.js b/app/addons/documents/views-sidebar.js
index 9fa6b58..5c37225 100644
--- a/app/addons/documents/views-sidebar.js
+++ b/app/addons/documents/views-sidebar.js
@@ -244,16 +244,17 @@ function(app, FauxtonAPI, Components, Documents, Databases) {
this.selected = !! options.selected;
this.selector = options.selector;
this.name = options.name;
- this.icons = {
- "Views": "fonticon-sidenav-map-reduce",
- "indexes": "fonticon-sidenav-search"
- };
+ this.indexTypeMap = {
+ views: { icon: 'fonticon-sidenav-map-reduce', urlFolder: '_view' },
+ indexes: { icon: 'fonticon-sidenav-search', urlFolder: '_indexes' }
+ };
},
serialize: function() {
return {
- icon: this.icons[this.ddocType],
+ icon: this.indexTypeMap[this.selector].icon,
+ urlFolder: this.indexTypeMap[this.selector].urlFolder,
ddocType: this.selector,
name: this.name,
index: this.index,