From 67464b2145e5d96014c99efeb5aef4cb640784a8 Mon Sep 17 00:00:00 2001 From: gschwab Date: Wed, 19 Feb 2014 13:13:16 +0100 Subject: [PATCH] more functionality for usermanagement --- .../frontend/img/arangodblogoAvatar.png | Bin 0 -> 11289 bytes .../frontend/js/collections/arangoUsers.js | 16 ++++++- .../frontend/js/templates/userBarView.ejs | 16 ++++++- .../frontend/js/views/navigationView.js | 3 +- .../aardvark/frontend/js/views/userBarView.js | 28 ++++++++++-- .../frontend/js/views/userManagementView.js | 40 ++++++++++++------ 6 files changed, 84 insertions(+), 19 deletions(-) create mode 100644 js/apps/system/aardvark/frontend/img/arangodblogoAvatar.png diff --git a/js/apps/system/aardvark/frontend/img/arangodblogoAvatar.png b/js/apps/system/aardvark/frontend/img/arangodblogoAvatar.png new file mode 100644 index 0000000000000000000000000000000000000000..8ca5632e45d0606d75fa2f77c1ff135f3ccb4f07 GIT binary patch literal 11289 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 P00000NkvXXu0mjfQHDkr literal 0 HcmV?d00001 diff --git a/js/apps/system/aardvark/frontend/js/collections/arangoUsers.js b/js/apps/system/aardvark/frontend/js/collections/arangoUsers.js index 3179d4b406..e204354f7e 100644 --- a/js/apps/system/aardvark/frontend/js/collections/arangoUsers.js +++ b/js/apps/system/aardvark/frontend/js/collections/arangoUsers.js @@ -1,5 +1,5 @@ /*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, plusplus: true */ -/*global window, Backbone, $, window */ +/*global window, Backbone, $,_, window */ window.ArangoUsers = Backbone.Collection.extend({ model: window.Users, @@ -71,6 +71,20 @@ window.ArangoUsers = Backbone.Collection.extend({ result.push(object); }); return result; + }, + + whoAmI: function() { + if (this.currentUser) { + return this.currentUser; + } + var result; + $.ajax("whoAmI", {async:false}).done( + function(data) { + result = data.name; + } + ); + this.currentUser = result; + return this.currentUser; } }); diff --git a/js/apps/system/aardvark/frontend/js/templates/userBarView.ejs b/js/apps/system/aardvark/frontend/js/templates/userBarView.ejs index a07f24cc77..bcb584d2fa 100644 --- a/js/apps/system/aardvark/frontend/js/templates/userBarView.ejs +++ b/js/apps/system/aardvark/frontend/js/templates/userBarView.ejs @@ -9,10 +9,24 @@
    -
  • <%=prename%> <%=lastname%>
    • +
  • + <% + if(username === null) { + %>-<% + } else { + if (name) {%> + <%=name%> (<%=username%>) + <% } else {%> + <%=username%> + <%} + + } + %> + <% if(username !== null) { %>
  • User profile
    • + <% } %>
  • User management
    • diff --git a/js/apps/system/aardvark/frontend/js/views/navigationView.js b/js/apps/system/aardvark/frontend/js/views/navigationView.js index f160e4f20f..50b1009334 100644 --- a/js/apps/system/aardvark/frontend/js/views/navigationView.js +++ b/js/apps/system/aardvark/frontend/js/views/navigationView.js @@ -19,7 +19,8 @@ current: window.currentDB }); this.userBarView = new window.UserBarView({ - collection: this.options.notificationCollection + collection: this.options.notificationCollection, + userCollection: window.activeUser }); this.statisticBarView = new window.StatisticBarView({}); }, diff --git a/js/apps/system/aardvark/frontend/js/views/userBarView.js b/js/apps/system/aardvark/frontend/js/views/userBarView.js index 2709a9b0dc..4fceaf61a5 100644 --- a/js/apps/system/aardvark/frontend/js/views/userBarView.js +++ b/js/apps/system/aardvark/frontend/js/views/userBarView.js @@ -19,6 +19,7 @@ this.collection.bind("add", this.renderNotifications.bind(this)); this.collection.bind("remove", this.renderNotifications.bind(this)); this.collection.bind("reset", this.renderNotifications.bind(this)); + this.userCollection = this.options.userCollection; }, notificationItem: templateEngine.createTemplate("notificationItem.ejs"), @@ -94,11 +95,32 @@ }, render: function (el) { + var username = this.userCollection.whoAmI(), + img = null, + name = null, + active = false, + currentUser = null; + if (username !== null) { + this.userCollection.fetch({async:false}); + currentUser = this.userCollection.findWhere({user: username}); + currentUser.set({loggedIn : true}); + name = currentUser.get("name"); + img = currentUser.get("img"); + active = currentUser.get("active"); + } + if (!img) { + img = "img/arangodblogoAvatar.png"; + } + if (!name) { + name = ""; + } + this.$el = el; this.$el.html(this.template.render({ - img : "https://s.gravatar.com/avatar/9c53a795affc3c3c03801ffae90e2e11?s=80", - prename : "Floyd", - lastname : "Pepper", + img : img, + name : name, + username : username, + active : active, notifications : this.collection })); diff --git a/js/apps/system/aardvark/frontend/js/views/userManagementView.js b/js/apps/system/aardvark/frontend/js/views/userManagementView.js index 3e4babbee0..36d12d6162 100644 --- a/js/apps/system/aardvark/frontend/js/views/userManagementView.js +++ b/js/apps/system/aardvark/frontend/js/views/userManagementView.js @@ -14,7 +14,7 @@ "click #submitCreateUser" : "submitCreateUser", "click #userManagementTable .icon_arangodb_roundminus" : "removeUser", "click #submitDeleteUser" : "submitDeleteUser", -// "click .editUser" : "editUser", + "click .editUser" : "editUser", "click #submitEditUser" : "submitEditUser" }, @@ -34,14 +34,28 @@ renderTable: function () { this.collection.forEach(function(user) { + var deleteButton = + ''; + if(user.get("loggedIn")) { + deleteButton = ''; + } + var username = user.get("user"), + name = user.get("name"), + img = user.get("img"), + active = user.get("active"); + if (!img) { + img = " "; + } + if (!name) { + name = " "; + } $("#userManagementTable tbody").append( - '' + - '' + user.get("user") + '' +//username - '' + "" + '' +//avatar - '' + "" + '' +//name - '' + user.get("active") + '' +//active - '' + + '' + + '' + username + '' +//username + '' + img + '' +//avatar + '' + name + '' +//name + '' + active + '' +//active + '' + deleteButton + '' + '' ); }); @@ -136,7 +150,7 @@ editUser : function(e) { this.userToEdit = $(e.currentTarget).attr("id"); - console.log(this.userToEdit); +// console.log(this.userToEdit); $('#editUserModal').modal('show'); var user = this.collection.findWhere({user: this.userToEdit}); $('#editUsername').html(user.get("user")); @@ -145,14 +159,14 @@ }, submitEditUser : function() { - console.log("submitEditUser"); +// console.log("submitEditUser"); var self = this; var userName = this.userToEdit; var name = $('#editName').val(); var status = $('#editStatus').is(':checked'); - console.log(userName); - console.log(name); - console.log(status); +// console.log(userName); +// console.log(name); +// console.log(status); if (!this.validateStatus(status)) { $('#editStatus').closest("th").css("backgroundColor", "red"); return;