Browse Source

[FIX] unsubscribtion error (#96)

fixes #94
pull/102/head
ArtyomLosev 8 years ago
committed by Ivan Yelizariev
parent
commit
172468a7ee
  1. 2
      mail_base/__openerp__.py
  2. 5
      mail_base/doc/changelog.rst
  3. 2
      mail_base/static/lib/base.js
  4. 2
      mail_base/views/templates.xml

2
mail_base/__openerp__.py

@ -4,7 +4,7 @@
"summary": """Makes Mail extendable""", "summary": """Makes Mail extendable""",
"category": "Discuss", "category": "Discuss",
"images": [], "images": [],
"version": "1.0.1",
"version": "1.0.2",
"author": "IT-Projects LLC, Pavel Romanchenko", "author": "IT-Projects LLC, Pavel Romanchenko",
"support": "apps@it-projects.info", "support": "apps@it-projects.info",

5
mail_base/doc/changelog.rst

@ -1,3 +1,8 @@
`1.0.2`
-------
- **FIX**: fixed an error with unsubscribing from channel or closing dialog window
`1.0.1` `1.0.1`
------- -------

2
mail_base/static/src/js/base.js → mail_base/static/lib/base.js

@ -612,7 +612,7 @@ var MailTools = core.Class.extend({
} else { } else {
msg = _.str.sprintf(_t('You unpinned your conversation with <b>%s</b>.'), channel.name); msg = _.str.sprintf(_t('You unpinned your conversation with <b>%s</b>.'), channel.name);
} }
remove_channel(channel);
this.remove_channel(channel);
chat_manager.bus.trigger("unsubscribe_from_channel", data.id); chat_manager.bus.trigger("unsubscribe_from_channel", data.id);
web_client.do_notify(_("Unsubscribed"), msg); web_client.do_notify(_("Unsubscribed"), msg);
} }

2
mail_base/views/templates.xml

@ -5,7 +5,7 @@
name="mail_base_assets_backend" name="mail_base_assets_backend"
inherit_id="web.assets_backend"> inherit_id="web.assets_backend">
<xpath expr="." position="inside"> <xpath expr="." position="inside">
<script src="/mail_base/static/src/js/base.js" type="text/javascript"></script>
<script src="/mail_base/static/lib/base.js" type="text/javascript"></script>
</xpath> </xpath>
</template> </template>
</data> </data>

Loading…
Cancel
Save