Merge branch 'securityutils' of https://github.com/owncloud/core into securityutils

1 files changed, 25 insertions, 3 deletions

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 60948bb99f3..86ed43d958e 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -96,9 +96,8 @@ var UserList = {
 		var lastLoginRel = t('settings', 'never');
 		var lastLoginAbs = lastLoginRel;
 		if(lastLogin !== 0) {
-			lastLogin = new Date(lastLogin * 1000);
-			lastLoginRel = relative_modified_date(lastLogin.getTime() / 1000);
-			lastLoginAbs = formatDate(lastLogin.getTime());
+			lastLoginRel = OC.Util.relativeModifiedDate(lastLogin);
+			lastLoginAbs = OC.Util.formatDate(lastLogin);
 		}
 		var $tdLastLogin = $tr.find('td.lastLogin');
 		$tdLastLogin.text(lastLoginRel);
@@ -708,4 +707,27 @@ $(document).ready(function () {
 		);
 	});
 
+	// Option to display/hide the "Storage location" column
+	$('#CheckboxStorageLocation').click(function() {
+		if ($('#CheckboxStorageLocation').is(':checked')) {
+			$("#headerStorageLocation").show();
+			$("#userlist td.storageLocation").show();
+		} else {
+			$("#headerStorageLocation").hide();
+			$("#userlist td.storageLocation").hide();
+		}
+	});
+	// Option to display/hide the "Last Login" column
+	$('#CheckboxLastLogin').click(function() {
+		if ($('#CheckboxLastLogin').is(':checked')) {
+			$("#headerLastLogin").show();
+			$("#userlist td.lastLogin").show();
+		} else {
+			$("#headerLastLogin").hide();
+			$("#userlist td.lastLogin").hide();
+		}
+	});
+
+
+
 });