Merge pull request #2356 from nabinhait/hotfix

Cherry-picked "set last active time to user" from develop

frappe/commands/site.py

@@ -460,6 +460,29 @@ def clear_limits(context, site, limits):
 		if not limits:
 			update_site_config('limits', 'None', validate=False)
 
+@click.command('set-last-active-for-user')
+@click.option('--user', help="Setup last active date for user")
+@pass_context
+def set_last_active_for_user(context, user=None):
+	"Set users last active date to current datetime"
+
+	from frappe.core.doctype.user.user import get_system_users
+	from frappe.utils.user import set_last_active_to_now
+	
+	site = get_site(context)
+
+	with frappe.init_site(site):
+		frappe.connect()
+		if not user:
+			user = get_system_users(limit=1)
+			if len(user) > 0:
+				user = user[0]
+			else:
+				return
+
+		set_last_active_to_now(user)
+		frappe.db.commit()
+
 
 commands = [
 	add_system_manager,
@@ -482,4 +505,5 @@ commands = [
 	clear_limits,
 	disable_user,
 	_use,
+	set_last_active_for_user,
 ]

frappe/core/doctype/user/user.py

@@ -652,17 +652,21 @@ def get_total_users():
 		where enabled=1 and user_type="System User"
 		and name not in ({})'''.format(", ".join(["%s"]*len(STANDARD_USERS))), STANDARD_USERS)[0][0]
 
-def get_system_users(exclude_users=None):
+def get_system_users(exclude_users=None, limit=None):
 	if not exclude_users:
 		exclude_users = []
 	elif not isinstance(exclude_users, (list, tuple)):
 		exclude_users = [exclude_users]
+	
+	limit_cond = ''
+	if limit:
+		limit_cond = 'limit {0}'.format(limit)
 
 	exclude_users += list(STANDARD_USERS)
 
 	system_users = frappe.db.sql_list("""select name from `tabUser`
 		where enabled=1 and user_type != 'Website User'
-		and name not in ({})""".format(", ".join(["%s"]*len(exclude_users))),
+		and name not in ({}) {}""".format(", ".join(["%s"]*len(exclude_users)), limit_cond),
 		exclude_users)
 
 	return system_users

frappe/utils/user.py

@@ -305,3 +305,7 @@ def get_users():
 		})
 
 	return users
+
+def set_last_active_to_now(user):
+	from frappe.utils import now_datetime
+	frappe.db.set_value("User", user, "last_active", now_datetime())