mirror of
https://github.com/OCA/reporting-engine.git
synced 2025-02-16 16:30:38 +02:00
pre-commit
This commit is contained in:
@@ -320,7 +320,11 @@ class BveView(models.Model):
|
||||
try:
|
||||
with self.env.cr.savepoint():
|
||||
self.env.cr.execute(
|
||||
"CREATE or REPLACE VIEW %s as (%s)", (AsIs(view_name), AsIs(query),)
|
||||
"CREATE or REPLACE VIEW %s as (%s)",
|
||||
(
|
||||
AsIs(view_name),
|
||||
AsIs(query),
|
||||
),
|
||||
)
|
||||
except Exception as e:
|
||||
raise UserError(
|
||||
|
||||
@@ -57,8 +57,16 @@ class BveViewLine(models.Model):
|
||||
def _constrains_unique_fields_check(self):
|
||||
seen = set()
|
||||
for line in self.mapped("bve_view_id.field_ids"):
|
||||
if (line.table_alias, line.field_id.id,) not in seen:
|
||||
seen.add((line.table_alias, line.field_id.id,))
|
||||
if (
|
||||
line.table_alias,
|
||||
line.field_id.id,
|
||||
) not in seen:
|
||||
seen.add(
|
||||
(
|
||||
line.table_alias,
|
||||
line.field_id.id,
|
||||
)
|
||||
)
|
||||
else:
|
||||
raise ValidationError(
|
||||
_("Field %s/%s is duplicated.\n" "Please remove the duplications.")
|
||||
|
||||
@@ -85,7 +85,11 @@ class IrModel(models.Model):
|
||||
for field in fields:
|
||||
for table_alias in model_table_map[field.model_id.id]:
|
||||
model_list.append(
|
||||
dict(dict_for_field(field), table_alias=table_alias, join_node=-1,)
|
||||
dict(
|
||||
dict_for_field(field),
|
||||
table_alias=table_alias,
|
||||
join_node=-1,
|
||||
)
|
||||
)
|
||||
return model_list
|
||||
|
||||
@@ -133,8 +137,7 @@ class IrModel(models.Model):
|
||||
|
||||
@api.model
|
||||
def get_models(self, table_model_map=None):
|
||||
""" Return list of model dicts for all available models.
|
||||
"""
|
||||
"""Return list of model dicts for all available models."""
|
||||
self = self.with_context(lang=self.env.user.lang)
|
||||
model_table_map = defaultdict(list)
|
||||
for k, v in (table_model_map or {}).items():
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
<field name="name">bve_view read access</field>
|
||||
<field name="model_id" search="[('model','=','bve.view')]" model="ir.model" />
|
||||
<field name="global" eval="True" />
|
||||
<field
|
||||
name="domain_force"
|
||||
> ['|',('user_ids','=',False),('user_ids','in',user.id)]</field>
|
||||
<field name="domain_force">
|
||||
['|',('user_ids','=',False),('user_ids','in',user.id)]
|
||||
</field>
|
||||
</record>
|
||||
</odoo>
|
||||
|
||||
@@ -126,9 +126,7 @@ odoo.define("bi_view_editor.FieldList", function(require) {
|
||||
return $.makeArray(
|
||||
this.$el.find("tbody tr").map(function () {
|
||||
var field = $(this).data("field");
|
||||
field.description = $(this)
|
||||
.find('input[name="description"]')
|
||||
.val();
|
||||
field.description = $(this).find('input[name="description"]').val();
|
||||
return field;
|
||||
})
|
||||
);
|
||||
|
||||
@@ -122,9 +122,7 @@ odoo.define("bi_view_editor.ModelList", function(require) {
|
||||
return;
|
||||
}
|
||||
var model = $el.data("model");
|
||||
$el.parent()
|
||||
.find(".field")
|
||||
.remove();
|
||||
$el.parent().find(".field").remove();
|
||||
if (this.isActive(model.id)) {
|
||||
this.removeAsActive(model.id);
|
||||
} else {
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
<div class="oe_form_field_bi_editor">
|
||||
<div class="body">
|
||||
<div class="left">
|
||||
|
||||
</div>
|
||||
<div class="right">
|
||||
|
||||
@@ -13,9 +14,10 @@
|
||||
<div class="footer">
|
||||
<div class="left" />
|
||||
<div class="right">
|
||||
<button class="clear-btn d-none"><span
|
||||
class="fa fa-eraser"
|
||||
/> Clear</button>
|
||||
<button class="clear-btn d-none">
|
||||
<span class="fa fa-eraser" />
|
||||
Clear
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -76,6 +78,7 @@
|
||||
<input type="text" class="search-bar" />
|
||||
</div>
|
||||
<div class="class-list">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</t>
|
||||
@@ -106,6 +109,7 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@@ -165,7 +169,8 @@
|
||||
type="checkbox"
|
||||
data-for="join_left"
|
||||
class="checkbox-join-left"
|
||||
/> Join Left
|
||||
/>
|
||||
Join Left
|
||||
</label>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
Reference in New Issue
Block a user