summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Trigaux <mat@openerp.com>2013-03-29 17:31:37 +0100
committerMartin Trigaux <mat@openerp.com>2013-03-29 17:31:37 +0100
commita3c5009a7ac704dc99b9e93f3ba7ef8d28468b7e (patch)
tree2c4f2c10990a406bdab3483efdc7af3f5b4565a5
parent1c52d7e3b9c3f514f719e644feb8d7efd7371aa6 (diff)
[ADD] autostart discover plan
bzr revid: mat@openerp.com-20130329163137-l6e45b0qj89yfm5c
-rw-r--r--addons/gamification/badge_view.xml5
-rw-r--r--addons/gamification/goal_base_data.xml4
-rw-r--r--addons/gamification/plan.py10
-rw-r--r--addons/gamification/security/gamification_security.xml4
4 files changed, 17 insertions, 6 deletions
diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 9d36250a7ca..cdb2c4dcac0 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -147,6 +147,11 @@ jspW8F2wIbhtSRr0Vf4AD6Nod0TaN4kAAAAASUVORK5CYII=" alt="got-it" /></t> -->
<em><field name="description"/></em>
</t>
<p>Granted <t t-esc="record.stat_count.raw_value" />x (<t t-esc="record.stat_count_distinct.raw_value"/> pers.)</p>
+ <div class="oe_kanban_project_avatars">
+ <t t-foreach="record.owner_ids.user_id.raw_value.slice(0,11)" t-as="member">
+ <img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
+ </t>
+ </div>
</div>
</div>
</t>
diff --git a/addons/gamification/goal_base_data.xml b/addons/gamification/goal_base_data.xml
index 5c8158f5523..e2952df60be 100644
--- a/addons/gamification/goal_base_data.xml
+++ b/addons/gamification/goal_base_data.xml
@@ -11,8 +11,6 @@
<field name="field_id" eval="ref('base.field_res_partner_tz')" />
<field name="domain">[('id','=',user_id),('partner_id.tz', '!=', False)]</field>
<field name="action_id">base.action_res_users_my</field>
- <field name="state">inprogress</field>
- <field name="autojoin_group_id" eval="ref('base.group_user')" />
</record>
<record model="gamification.goal.type" id="type_base_avatar">
@@ -47,6 +45,8 @@
<field name="visibility_mode">progressbar</field>
<field name="report_message_frequency">never</field>
<field name="planline_ids" eval="[(4, ref('planline_base_discover1')),(4, ref('planline_base_discover2'))]"/>
+ <field name="autojoin_group_id" eval="ref('base.group_user')" />
+ <field name="state">inprogress</field>
</record>
diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py
index 53230c5cd87..76df8e7b3ad 100644
--- a/addons/gamification/plan.py
+++ b/addons/gamification/plan.py
@@ -25,6 +25,8 @@ from templates import TemplateHelper
from datetime import date, datetime, timedelta
import calendar
+import logging
+_logger = logging.getLogger(__name__)
def start_end_date_for_period(period):
@@ -208,7 +210,8 @@ class gamification_goal_plan(osv.Model):
Start planned plans (in draft and with start_date = today)
Create the goals for planlines not linked to goals (eg: modified the
plan to add planlines)
- Update every goal running"""
+ Update every goal running
+ """
if not context: context = {}
# start planned plans
@@ -280,7 +283,10 @@ class gamification_goal_plan(osv.Model):
if plan.autojoin_group_id:
self.plan_subscribe_users(cr, uid, ids, [user.id for user in plan.autojoin_group_id.users], context=context)
- self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
+ if len(plan.user_ids) > 0:
+ self.write(cr, uid, plan.id, {'state': 'inprogress'}, context=context)
+ else:
+ _logger.warning("Can not start planned plan, no subscribed users")
return self.generate_goals_from_plan(cr, uid, ids, context=context)
def action_check(self, cr, uid, ids, context=None):
diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
index d3c30a97efc..8a60957558c 100644
--- a/addons/gamification/security/gamification_security.xml
+++ b/addons/gamification/security/gamification_security.xml
@@ -3,13 +3,13 @@
<data>
<record model="ir.module.category" id="module_goal_category">
<field name="name">Goal</field>
- <field name="description">Helps you handle your lunch needs, if you are a manager you will be able to create new products, cashmoves and to confirm or cancel orders.</field>
+ <field name="description"></field>
<field name="sequence">17</field>
</record>
<record id="group_goal_user" model="res.groups">
<field name="name">User</field>
<field name="category_id" ref="module_goal_category"/>
- <field name="users" eval="[(4, ref('base.group_user'))]"/>
+ <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
</record>
<record id="group_goal_manager" model="res.groups">
<field name="name">Manager</field>