Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 03:26:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 0.7.0

Browse Source 
Conflicts:
	src/user.js
This commit is contained in:
Julian Lam
2015-01-28 13:39:21 -05:00
parent 5a3c056759 63eeee4394
commit aabfeba38d
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/src/client/groups/list.js
View File

@@ -32,16 +32,18 @@ define('forum/groups/list', function() {
// Group searching // Group searching
$('#search-text').on('keydown', function(e) { $('#search-text').on('keydown', function(e) {
if (e.keyCode === 13) { Groups.search(); } if (e.keyCode === 13) { Groups.search(e); }
}); });
$('#search-button').on('click', Groups.search); $('#search-button').on('click', Groups.search);
}; };
Groups.search = function() { Groups.search = function(event) {
var groupsEl = $('#groups-list'), var groupsEl = $('#groups-list'),
queryEl = $('#search-text'), queryEl = $('#search-text'),
sortEl = $('#search-sort'); sortEl = $('#search-sort');
event.preventDefault();
socket.emit('groups.search', { socket.emit('groups.search', {
query: queryEl.val(), query: queryEl.val(),
options: { options: {

1
src/user.js
View File

@@ -249,6 +249,7 @@ var async = require('async'),
user.banned = parseInt(user.banned, 10) === 1; user.banned = parseInt(user.banned, 10) === 1;
user['email:confirmed'] = parseInt(user['email:confirmed'], 10) === 1; user['email:confirmed'] = parseInt(user['email:confirmed'], 10) === 1;
}); });
plugins.fireHook('filter:userlist.get', {users: results.userData}, function(err, data) { plugins.fireHook('filter:userlist.get', {users: results.userData}, function(err, data) {
if (err) { if (err) {
return callback(err); return callback(err);