Browse Source

[minor] chat page listview fixes (#2901)

version-14
Makarand Bauskar 8 years ago
committed by Rushabh Mehta
parent
commit
2cf165c07b
2 changed files with 29 additions and 17 deletions
  1. +24
    -12
      frappe/desk/page/chat/chat.js
  2. +5
    -5
      frappe/desk/page/chat/chat.py

+ 24
- 12
frappe/desk/page/chat/chat.js View File

@@ -58,10 +58,8 @@ frappe.Chat = Class.extend({
},

prepend_comment: function(comment) {
var $row = $('<div class="list-row"/>');
frappe.pages.chat.chat.list.data.unshift(comment);
frappe.pages.chat.chat.list.render_row($row, comment);
frappe.pages.chat.chat.list.wrapper.prepend($row);
this.render_row(comment, true);
},

make_sidebar: function() {
@@ -156,7 +154,7 @@ frappe.Chat = Class.extend({
make_message_list: function(contact) {
var me = this;

this.list = new frappe.ui.Listing({
this.list = new frappe.ui.BaseList({
parent: this.page.main.find(".message-list"),
page: this.page,
method: 'frappe.desk.page.chat.chat.get_list',
@@ -165,17 +163,31 @@ frappe.Chat = Class.extend({
},
hide_refresh: true,
freeze: false,
render_row: function(wrapper, data) {
me.prepare(data);
var row = $(frappe.render_template("chat_row", {
data: data
})).appendTo(wrapper);
row.find(".avatar, .indicator").tooltip();
}

render_view: function (values) {
values.map(function (value) {
me.render_row(value);
});
},
});
},

render_row: function(value, prepend) {
this.prepare(value)

var wrapper = $('<div class="list-row">')
.data("data", this.meta)

if(!prepend)
wrapper.appendTo($(".result-list")).get(0);
else
wrapper.prependTo($(".result-list")).get(0);

var row = $(frappe.render_template("chat_row", {
data: value
})).appendTo(wrapper)
row.find(".avatar, .indicator").tooltip();
},

delete: function(ele) {
$(ele).parent().css('opacity', 0.6);
return frappe.call({


+ 5
- 5
frappe/desk/page/chat/chat.py View File

@@ -10,8 +10,8 @@ from frappe.utils import cint
@frappe.whitelist()
def get_list(arg=None):
"""get list of messages"""
frappe.form_dict['limit_start'] = int(frappe.form_dict['limit_start'])
frappe.form_dict['limit_page_length'] = int(frappe.form_dict['limit_page_length'])
frappe.form_dict['start'] = int(frappe.form_dict['start'])
frappe.form_dict['page_length'] = int(frappe.form_dict['page_length'])
frappe.form_dict['user'] = frappe.session['user']

# set all messages as read
@@ -36,7 +36,7 @@ def get_list(arg=None):
and reference_doctype = 'User'
and reference_name = %(user)s
order by creation desc
limit %(limit_start)s, %(limit_page_length)s""".format(fields),
limit %(start)s, %(page_length)s""".format(fields),
frappe.local.form_dict, as_dict=1)

if frappe.form_dict.contact == frappe.session.user:
@@ -50,7 +50,7 @@ def get_list(arg=None):
or reference_name=%(user)s
or owner=reference_name)
order by creation desc
limit %(limit_start)s, %(limit_page_length)s""".format(fields),
limit %(start)s, %(page_length)s""".format(fields),
frappe.local.form_dict, as_dict=1)
else:
return frappe.db.sql("""select * from `tabCommunication`
@@ -60,7 +60,7 @@ def get_list(arg=None):
and ((owner=%(contact)s and reference_name=%(user)s)
or (owner=%(contact)s and reference_name=%(contact)s))
order by creation desc
limit %(limit_start)s, %(limit_page_length)s""".format(fields),
limit %(start)s, %(page_length)s""".format(fields),
frappe.local.form_dict, as_dict=1)

@frappe.whitelist()


Loading…
Cancel
Save