You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by de...@apache.org on 2014/08/25 15:40:28 UTC
[48/48] fauxton commit: updated refs/heads/secondary-indexes to
8688d16
Fix replication links from all dbs page and header
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/66d97572
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/66d97572
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/66d97572
Branch: refs/heads/secondary-indexes
Commit: 66d97572055344a6ec4511c830f356c86f346ee4
Parents: 885f234
Author: deathbearbrown <de...@gmail.com>
Authored: Sun Aug 24 16:33:43 2014 +0200
Committer: deathbearbrown <de...@gmail.com>
Committed: Mon Aug 25 09:37:37 2014 -0400
----------------------------------------------------------------------
app/addons/permissions/views.js | 9 +++++----
app/addons/replication/route.js | 5 +++--
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/66d97572/app/addons/permissions/views.js
----------------------------------------------------------------------
diff --git a/app/addons/permissions/views.js b/app/addons/permissions/views.js
index 43f5aab..0080da7 100644
--- a/app/addons/permissions/views.js
+++ b/app/addons/permissions/views.js
@@ -20,6 +20,7 @@ function (app, FauxtonAPI, Permissions ) {
Permissions.events = _.extend(events, Backbone.Events);
Permissions.Permissions = FauxtonAPI.View.extend({
+ className: "view",
template: "addons/permissions/templates/permissions",
initialize: function (options) {
@@ -80,7 +81,7 @@ function (app, FauxtonAPI, Permissions ) {
beforeRender: function () {
var section = this.model.get(this.section);
-
+
this.nameViews = [];
this.roleViews = [];
@@ -107,11 +108,11 @@ function (app, FauxtonAPI, Permissions ) {
discardRemovedViews: function () {
this.nameViews = _.filter(this.nameViews, function (view) {
- return !view.removed;
+ return !view.removed;
});
this.roleViews = _.filter(this.roleViews, function (view) {
- return !view.removed;
+ return !view.removed;
});
},
@@ -178,7 +179,7 @@ function (app, FauxtonAPI, Permissions ) {
removeItem: function (event) {
var that = this;
event.preventDefault();
-
+
this.removed = true;
Permissions.events.trigger('itemRemoved');
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/66d97572/app/addons/replication/route.js
----------------------------------------------------------------------
diff --git a/app/addons/replication/route.js b/app/addons/replication/route.js
index 17368f8..d0c298a 100644
--- a/app/addons/replication/route.js
+++ b/app/addons/replication/route.js
@@ -22,6 +22,7 @@ function(app, FauxtonAPI, Replication, Views) {
roles: ["_admin"],
routes: {
"replication": "defaultView",
+ "replication/new/:dbname": "defaultView",
"replication/:dbname": "defaultView"
},
selectedHeader: "Replication",
@@ -29,7 +30,7 @@ function(app, FauxtonAPI, Replication, Views) {
return [this.replication.url(), this.replication.documentation];
},
crumbs: [
- {"name": "Replicate changes from: ", "link": "replication"}
+ {"name": "Replicate ", "link": "replication"}
],
defaultView: function(dbname){
this.databases = new Replication.DBList({});
@@ -39,7 +40,7 @@ function(app, FauxtonAPI, Replication, Views) {
selectedDB: dbname ||"",
collection: this.databases,
status: this.tasks
- }));
+ }));
}
});