Skip to content

Commit

Permalink
Merge pull request #6 from prakashpp/3.0
Browse files Browse the repository at this point in the history
Email queue tree and form view #6415
  • Loading branch information
Sharoon Thomas committed Dec 26, 2014
2 parents 307d15f + c92f6a2 commit fbac846
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 7 deletions.
14 changes: 7 additions & 7 deletions email_queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,29 @@
"""
from email.message import Message

from trytond.model import ModelSQL, fields
from trytond.model import ModelSQL, ModelView, fields
from trytond.tools import get_smtp_server
from trytond.transaction import Transaction

__all__ = ['EmailQueue']


class EmailQueue(ModelSQL):
class EmailQueue(ModelSQL, ModelView):
"""
Email Queue
"""
__name__ = "email.queue"

from_addr = fields.Char("From Address", required=True)
to_addrs = fields.Char("To Addresses", required=True)
msg = fields.Text("Message", required=True)
attempts = fields.Integer("Attempts", required=True)
from_addr = fields.Char("From Address", required=True, readonly=True)
to_addrs = fields.Char("To Addresses", required=True, readonly=True)
msg = fields.Text("Message", required=True, readonly=True)
attempts = fields.Integer("Attempts", required=True, readonly=True)
state = fields.Selection([
("outbox", "Outbox"),
("sending", "Sending"),
("sent", "Sent"),
("failed", "Failed"),
], "State", required=True)
], "State", required=True, readonly=True)

@staticmethod
def default_state():
Expand Down
55 changes: 55 additions & 0 deletions email_queue.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,61 @@
<?xml version="1.0"?>
<tryton>
<data>
<record model="ir.ui.view" id="email_queue_view_tree">
<field name="model">email.queue</field>
<field name="type">tree</field>
<field name="name">email_queue_tree</field>
</record>
<record model="ir.ui.view" id="email_queue_view_form">
<field name="model">email.queue</field>
<field name="type">form</field>
<field name="name">email_queue_form</field>
</record>
<record model="ir.action.act_window" id="act_email_queue_form">
<field name="name">Emails Queue</field>
<field name="res_model">email.queue</field>
</record>
<record model="ir.action.act_window.view" id="act_email_queue_form_view1">
<field name="sequence" eval="10"/>
<field name="view" ref="email_queue_view_tree"/>
<field name="act_window" ref="act_email_queue_form"/>
</record>
<record model="ir.action.act_window.domain" id="act_email_queue_form_domain_outbox">
<field name="name">Outbox</field>
<field name="sequence" eval="10"/>
<field name="domain">[('state', '=', 'outbox')]</field>
<field name="act_window" ref="act_email_queue_form"/>
</record>
<record model="ir.action.act_window.domain" id="act_email_queue_form_domain_sent">
<field name="name">Sent</field>
<field name="sequence" eval="10"/>
<field name="domain">[('state', '=', 'sent')]</field>
<field name="act_window" ref="act_email_queue_form"/>
</record>
<record model="ir.action.act_window.domain" id="act_email_queue_form_domain_failed">
<field name="name">Failed</field>
<field name="sequence" eval="10"/>
<field name="domain">[('state', '=', 'failed')]</field>
<field name="act_window" ref="act_email_queue_form"/>
</record>
<record model="ir.action.act_window.domain" id="act_email_queue_form_domain_all">
<field name="name">All</field>
<field name="sequence" eval="9999"/>
<field name="domain"></field>
<field name="act_window" ref="act_email_queue_form"/>
</record>
<record model="ir.action.act_window.view" id="act_email_queue_form_view2">
<field name="sequence" eval="20"/>
<field name="view" ref="email_queue_view_form"/>
<field name="act_window" ref="act_email_queue_form"/>
</record>

<menuitem parent="ir.menu_administration" action="act_email_queue_form" id="menu_email_queue_form"/>
<record model="ir.ui.menu-res.group" id="menu_email_queue_form_group_admin">
<field name="menu" ref="menu_email_queue_form"/>
<field name="group" ref="res.group_admin"/>
</record>

<record model="res.user" id="email_sender">
<field name="login">email_sender</field>
<field name="name">Email Sender</field>
Expand Down
11 changes: 11 additions & 0 deletions view/email_queue_form.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0"?>
<form string="Email Queue" col="4">
<label name="from_addr"/>
<field name="from_addr"/>
<label name="to_addrs"/>
<field name="to_addrs"/>
<label name="attempts"/>
<field name="attempts"/>
<label name="state"/>
<field name="state"/>
</form>
7 changes: 7 additions & 0 deletions view/email_queue_tree.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0"?>
<tree string="Email Queue">
<field name="from_addr"/>
<field name="to_addrs"/>
<field name="attempts"/>
<field name="state"/>
</tree>

0 comments on commit fbac846

Please sign in to comment.