couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [09/50] [abbrv] git commit: updated refs/heads/1867-feature-plugins to 8aad450
Date Mon, 09 Sep 2013 09:53:29 GMT
Fauxton: add permissions button in database dropdown


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/34006fe3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/34006fe3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/34006fe3

Branch: refs/heads/1867-feature-plugins
Commit: 34006fe3e041435eba731e75922fb525ea1cf689
Parents: 89868bc
Author: Garren Smith <garren.smith@gmail.com>
Authored: Thu Aug 15 10:46:38 2013 +0200
Committer: Jan Lehnardt <jan@apache.org>
Committed: Mon Sep 9 11:16:42 2013 +0200

----------------------------------------------------------------------
 src/fauxton/app/modules/documents/views.js       | 3 ++-
 src/fauxton/app/templates/documents/sidebar.html | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/34006fe3/src/fauxton/app/modules/documents/views.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js
index 5f61f95..74698ef 100644
--- a/src/fauxton/app/modules/documents/views.js
+++ b/src/fauxton/app/modules/documents/views.js
@@ -47,7 +47,7 @@ function(app, FauxtonAPI, Documents, pouchdb, Codemirror, JSHint) {
       return {
         // TODO make this not hard coded here
         changes_url: '#' + this.database.url('changes'),
-        db_url: '#' + this.database.url('index') + '?limit=100'
+        db_url: '#' + this.database.url('index') + '?limit=100',
       };
     },
 
@@ -1333,6 +1333,7 @@ function(app, FauxtonAPI, Documents, pouchdb, Codemirror, JSHint) {
     serialize: function() {
       return {
         changes_url: '#' + this.database.url('changes'),
+        permissions_url: '#' + this.database.url('app') + '/permissions',
         db_url: '#' + this.database.url('index') + '?limit=100',
         index: [1,2,3],
         view: [1,2],

http://git-wip-us.apache.org/repos/asf/couchdb/blob/34006fe3/src/fauxton/app/templates/documents/sidebar.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/sidebar.html b/src/fauxton/app/templates/documents/sidebar.html
index 7d283d5..18c6856 100644
--- a/src/fauxton/app/templates/documents/sidebar.html
+++ b/src/fauxton/app/templates/documents/sidebar.html
@@ -24,9 +24,9 @@ the License.
           <!-- dropdown menu links -->
           <li><a href="<%= db_url %>">Docs</a></li>
           <!-- TODO::REENABLE
-          <li><a href="#">Permissions</a></li>
           <li><a href="#">Stats</a></li>
           -->
+          <li><a href="<%= permissions_url %>">Permissions</a></li>
           <li><a  href="<%= changes_url %>">Changes</a></li>
         </ul>
       </div>


Mime
View raw message