pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] gamification : rename rank.karma_required into karma_min for grep convenience

Browse Source 
Rename rank.karma_required into karma_min to avoid confusion
with karma_required from website_forum

Linked to Task ID : 1922159
Closes PR #30965
This commit is contained in:
David Beguin
2019-02-08 18:03:29 +00:00
parent a20408e995
commit b9902d961e
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/gamification/data/gamification_karma_rank_data.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<field name="name">Newbie</field>
<field name="description" type="html"><p>You just began the adventure! Welcome!</p></field>
<field name="description_reach_next" type="html"><p>Keep going !</p></field>
<field name="karma_required">1</field>
<field name="karma_min">1</field>
<field name="image" type="base64" file="gamification/static/img/rank_newbie.png"/>
</record>
</data>
addons/gamification/data/gamification_karma_rank_demo.xml
+4 -4
View File
@@ -5,7 +5,7 @@
<field name="name">Student</field>
<field name="description" type="html"><p>You begin to understand things ! Keep going!</p></field>
<field name="description_reach_next" type="html"><p>Keep going !</p></field>
<field name="karma_required">100</field>
<field name="karma_min">100</field>
<field name="image" type="base64" file="gamification/static/img/rank_student.png"/>
</record>
@@ -13,7 +13,7 @@
<field name="name">Bachelor</field>
<field name="description" type="html"><p>Hey ! You're not so dumb after all !</p></field>
<field name="description_reach_next" type="html"><p>Keep going !</p></field>
<field name="karma_required">500</field>
<field name="karma_min">500</field>
<field name="image" type="base64" file="gamification/static/img/rank_bachelor.png"/>
</record>
@@ -21,7 +21,7 @@
<field name="name">Master</field>
<field name="description" type="html"><p>You're good ! Really Good !</p></field>
<field name="description_reach_next" type="html"><p>Keep going !</p></field>
<field name="karma_required">2000</field>
<field name="karma_min">2000</field>
<field name="image" type="base64" file="gamification/static/img/rank_master.png"/>
</record>
@@ -29,7 +29,7 @@
<field name="name">Doctor</field>
<field name="description" type="html"><p>Ok, RESPECT !</p></field>
<field name="description_reach_next" type="html"><p>Keep going !</p></field>
<field name="karma_required">10000</field>
<field name="karma_min">10000</field>
<field name="image" type="base64" file="gamification/static/img/rank_doctor.png"/>
</record>
addons/gamification/models/gamification_karma_rank.py
+2 -2
View File
@@ -15,14 +15,14 @@ class KarmaError(Forbidden):
class KarmaRank(models.Model):
_name = 'gamification.karma.rank'
_description = 'Rank based on karma'
_order = 'karma_required'
_order = 'karma_min'
name = fields.Text(string='Rank Name', translate=True, required=True)
description = fields.Html(string='Description', translate=html_translate, sanitize_attributes=False,)
description_reach_next = fields.Html(
string='Motivation phrase', translate=html_translate, sanitize_attributes=False,
help="Motivation phrase to reach next rank")
karma_required = fields.Integer(string='Required Karma', help='Minimum karma needed to reach this rank')
karma_min = fields.Integer(string='Required Karma', help='Minimum karma needed to reach this rank')
user_ids = fields.One2many('res.users', 'rank_id', string='Users', help="Users having this rank")
image = fields.Binary('Rank Icon')
image_medium = fields.Binary(
addons/gamification/models/res_users.py
+4 -4
View File
@@ -58,7 +58,7 @@ class Users(models.Model):
return True
def _rank_changed(self):
if self.rank_id.karma_required > 0:
if self.rank_id.karma_min > 0:
template = self.env.ref('gamification.mail_template_data_new_rank_reached', raise_if_not_found=False)
if template:
template.send_mail(self.id, force_send=True, notif_layout='mail.mail_notification_light')
@@ -68,11 +68,11 @@ class Users(models.Model):
The caller should filter the users on karma > 0 before calling this method
to avoid looping on every single users
"""
ranks = [{'rank': rank, 'karma_required': rank.karma_required} for rank in
self.env['gamification.karma.rank'].search([], order="karma_required DESC")]
ranks = [{'rank': rank, 'karma_min': rank.karma_min} for rank in
self.env['gamification.karma.rank'].search([], order="karma_min DESC")]
for user in self:
for i in range(0, len(ranks)):
if user.karma >= ranks[i]['karma_required']:
if user.karma >= ranks[i]['karma_min']:
if user.rank_id != ranks[i]['rank']:
user.rank_id = ranks[i]['rank'].id
user.next_rank_id = ranks[i - 1]['rank'].id if i > 0 else False
addons/gamification/views/gamification_karma_rank_views.xml
+3 -3
View File
@@ -21,7 +21,7 @@
<field name="arch" type="xml">
<search string="Search Ranks">
<field name="name"/>
<field name="karma_required"/>
<field name="karma_min"/>
<field name="description"/>
<field name="user_ids"/>
</search>
@@ -34,7 +34,7 @@
<field name="arch" type="xml">
<tree string="Ranks List">
<field name="name"/>
<field name="karma_required"/>
<field name="karma_min"/>
<field name="description"/>
<field name="user_ids"/>
</tree>
@@ -56,7 +56,7 @@
</h1>
</div>
<group>
<field name="karma_required"/>
<field name="karma_min"/>
<field name="description" placeholder="e.g. A Master Chief knows quite everything on the forum! You cannot beat him!"/>
<field name="create_date" invisible="1"/>
</group>