diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-08-02 06:49:15 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-08-02 06:49:15 +0200 |
| commit | 56803c5814dc497e42d253e2efe649508ba26334 (patch) | |
| tree | b95699a708ed429d4f53d5e66072fab57d8679f1 | |
| parent | 89ddff91e3575022b895afe44b93f3788cfe06d5 (diff) | |
[IMP] website_event
bzr revid: chm@openerp.com-20130802044915-zo5shxu4dw7zn05c
| -rw-r--r-- | addons/website_event/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/website_event/security/website_event.xml | 2 | ||||
| -rw-r--r-- | addons/website_event/views/website_event.xml | 18 |
3 files changed, 14 insertions, 8 deletions
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py index a039bcce61f..da4004b92c6 100644 --- a/addons/website_event/controllers/main.py +++ b/addons/website_event/controllers/main.py @@ -18,7 +18,7 @@ class website_hr(http.Controller): html = website.render("website_event.index", values) return html - @http.route(['/hr/publish'], type='http', auth="public") + @http.route(['/event/publish'], type='http', auth="public") def publish(self, **post): obj_id = int(post['id']) data_obj = request.registry['event.event'] diff --git a/addons/website_event/security/website_event.xml b/addons/website_event/security/website_event.xml index c571a1f4f9b..05014176217 100644 --- a/addons/website_event/security/website_event.xml +++ b/addons/website_event/security/website_event.xml @@ -4,7 +4,7 @@ <record id="event_event_public" model="ir.rule"> <field name="name">event: Public</field> <field name="model_id" ref="event.model_event_event"/> - <field name="domain_force">[('website_published', '=', True), ('state', '=', 'confirm')]</field> + <field name="domain_force">[('website_published', '=', True)]</field> <field name="groups" eval="[(4, ref('base.group_public'))]"/> <field name="perm_read" eval="True"/> <field name="perm_write" eval="False"/> diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml index 23beaa97adf..f48ed99458c 100644 --- a/addons/website_event/views/website_event.xml +++ b/addons/website_event/views/website_event.xml @@ -51,14 +51,20 @@ <h5 class="media-heading"><span t-record="event_id" t-field="name"> </span></h5> <div>Start Date: <span t-record="event_id" t-field="date_begin"> </span></div> <div>End Date: <span t-record="event_id" t-field="date_end"> </span></div> + <div>Organized by: <span t-record="event_id" t-field="user_id"> </span></div> <div t-record="event_id" t-field="type"> </div> <div t-record="event_id" t-field="country_id"> </div> - <div>Participations : - <span t-record="event_id" t-field="register_current">0</span> - <t t-if="event_id.register_max"> / <span t-record="event_id" t-field="register_max"> </span></t> - </div> + <span class="label label-info"> + <t t-if="event_id.register_avail lte 10 and record.register_avail gt 0">Only</t> + <t t-if="event_id.register_avail == 9999">No ticket available.</t> + <t t-if="event_id.register_avail != 9999"> + <t t-esc="event_id.register_avail"/> + <t t-if="event_id.register_avail > 1">tickets </t> + <t t-if="event_id.register_avail lte 1">ticket </t> + available. + </t> + </span> <div t-record="event_id" t-field="note"> </div> - <div t-record="event_id" t-field="country_id"> </div> </div> </div> </div> @@ -68,4 +74,4 @@ </t> </template> </data> -</openerp> +</openerp>
\ No newline at end of file |