OCA
/
web
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

FIX remove api.one

pull/507/head
Nicolas Mac Rouillon 8 years ago
parent
04b88d62c9
commit
a7521442c5
14 changed files with 70 additions and 344 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 61
      web_advanced_search_wildcard/README.rst
  2. 0
      web_advanced_search_wildcard/__init__.py
  3. 21
      web_advanced_search_wildcard/__openerp__.py
  4. 27
      web_advanced_search_wildcard/i18n/de.po
  5. 26
      web_advanced_search_wildcard/i18n/es.po
  6. 26
      web_advanced_search_wildcard/i18n/fi.po
  7. 26
      web_advanced_search_wildcard/i18n/fr.po
  8. 26
      web_advanced_search_wildcard/i18n/pt_BR.po
  9. 26
      web_advanced_search_wildcard/i18n/sl.po
  10. 23
      web_advanced_search_wildcard/i18n/web_advanced_search_wildcard.pot
  11. BIN
      web_advanced_search_wildcard/static/description/screenshot.png
  12. 6
      web_advanced_search_wildcard/static/src/js/search.js
  13. 10
      web_advanced_search_wildcard/views/template.xml
  14. 72
      web_dashboard_tile/models/tile_tile.py

61
web_advanced_search_wildcard/README.rst
View File

@ -1,61 +0,0 @@
.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
:alt: License: AGPL-3
============================
Wildcard in advanced search
============================
Allows =ilike ('matches') operator to advanced search option.
Usage
=====
Use % as a placeholder.
Example: "Zip" - 'matches' - "1%" gives all zip starting with 1
.. image:: /web_advanced_search_wildcard/static/description/screenshot.png
:alt: Screenshot
Also allows insensitive exact search.
Example "Name" - 'matches' - "john" will find "John" and "john" but not "Johnson".
Bug Tracker
===========
Bugs are tracked on `GitHub Issues <https://github.com/OCA/web/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed feedback
`here <https://github.com/OCA/web/issues/new?body=module:%20web_advanced_search_wildcard%0Aversion:%208.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
Credits
=======
Images
------
* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
Contributors
------------
* Markus Schneider <markus.schneider@initos.com>
* Thomas Rehn <thomas.rehn@initos.com>
* L Freeke <lfreeke@therp.nl>
Maintainer
----------
.. image:: https://odoo-community.org/logo.png
:alt: Odoo Community Association
:target: https://odoo-community.org
This module is maintained by the OCA.
OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.
To contribute to this module, please visit https://odoo-community.org.

0
web_advanced_search_wildcard/__init__.py
View File

21
web_advanced_search_wildcard/__openerp__.py
View File

@ -1,21 +0,0 @@
# -*- coding: utf-8 -*-
# © 2014 initOS GmbH & Co. KG (<http://www.initos.com>).
# © 2016 Therp BV <http://therp.nl>.
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
{
"name": "Wildcard in advanced search",
"summary": "Webmodule to add wildcard operators in advanced search field",
"version": "8.0.1.0.0",
"category": "web",
"license": 'AGPL-3',
"author": "initOS GmbH & Co. KG,Odoo Community Association (OCA),Therp BV",
"application": False,
"installable": True,
"depends": [
"web"
],
'data': [
"views/template.xml",
],
}

27
web_advanced_search_wildcard/i18n/de.po
View File

@ -1,27 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
#
# Rudolf Schnapka <schnapkar@golive-saar.de>, 2015.
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-09-15 09:11+0000\n"
"PO-Revision-Date: 2015-01-04 14:07+0100\n"
"Last-Translator: Rudolf Schnapka <schnapkar@golive-saar.de>\n"
"Language-Team: German <kde-i18n-de@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: \n"
"Language: de\n"
"X-Generator: Lokalize 1.5\n"
#. module: web_advanced_search_wildcard
#. openerp-web
#: code:addons/web_advanced_search_wildcard/static/src/js/search.js:4
#, python-format
msgid "matches"
msgstr "gleicht"

26
web_advanced_search_wildcard/i18n/es.po
View File

@ -1,26 +0,0 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * web_advanced_search_wildcard
#
# Translators:
# Pedro M. Baeza <pedro.baeza@gmail.com>, 2016
msgid ""
msgstr ""
"Project-Id-Version: web (8.0)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-26 01:59+0000\n"
"PO-Revision-Date: 2016-10-13 18:37+0000\n"
"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>\n"
"Language-Team: Spanish (http://www.transifex.com/oca/OCA-web-8-0/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: web_advanced_search_wildcard
#. openerp-web
#: code:addons/web_advanced_search_wildcard/static/src/js/search.js:4
#, python-format
msgid "matches"
msgstr "coincide con"

26
web_advanced_search_wildcard/i18n/fi.po
View File

@ -1,26 +0,0 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * web_advanced_search_wildcard
#
# Translators:
# Jarmo Kortetjärvi <jarmo.kortetjarvi@gmail.com>, 2016
msgid ""
msgstr ""
"Project-Id-Version: web (8.0)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-11 02:17+0000\n"
"PO-Revision-Date: 2016-03-07 08:28+0000\n"
"Last-Translator: Jarmo Kortetjärvi <jarmo.kortetjarvi@gmail.com>\n"
"Language-Team: Finnish (http://www.transifex.com/oca/OCA-web-8-0/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: fi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: web_advanced_search_wildcard
#. openerp-web
#: code:addons/web_advanced_search_wildcard/static/src/js/search.js:4
#, python-format
msgid "matches"
msgstr "osumat"

26
web_advanced_search_wildcard/i18n/fr.po
View File

@ -1,26 +0,0 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * web_advanced_search_wildcard
#
# Translators:
# Christophe CHAUVET <christophe.chauvet@gmail.com>, 2016
msgid ""
msgstr ""
"Project-Id-Version: web (8.0)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-06 15:50+0000\n"
"PO-Revision-Date: 2016-05-06 08:19+0000\n"
"Last-Translator: Christophe CHAUVET <christophe.chauvet@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/oca/OCA-web-8-0/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. module: web_advanced_search_wildcard
#. openerp-web
#: code:addons/web_advanced_search_wildcard/static/src/js/search.js:4
#, python-format
msgid "matches"
msgstr "correspondances"

26
web_advanced_search_wildcard/i18n/pt_BR.po
View File

@ -1,26 +0,0 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * web_advanced_search_wildcard
#
# Translators:
# danimaribeiro <danimaribeiro@gmail.com>, 2016
msgid ""
msgstr ""
"Project-Id-Version: web (8.0)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-11 02:17+0000\n"
"PO-Revision-Date: 2016-03-05 16:05+0000\n"
"Last-Translator: danimaribeiro <danimaribeiro@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-web-8-0/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. module: web_advanced_search_wildcard
#. openerp-web
#: code:addons/web_advanced_search_wildcard/static/src/js/search.js:4
#, python-format
msgid "matches"
msgstr "resultados"

26
web_advanced_search_wildcard/i18n/sl.po
View File

@ -1,26 +0,0 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * web_advanced_search_wildcard
#
# Translators:
# Matjaž Mozetič <m.mozetic@matmoz.si>, 2016
msgid ""
msgstr ""
"Project-Id-Version: web (8.0)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-02-26 02:05+0000\n"
"PO-Revision-Date: 2016-02-27 16:56+0000\n"
"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-web-8-0/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
#. module: web_advanced_search_wildcard
#. openerp-web
#: code:addons/web_advanced_search_wildcard/static/src/js/search.js:4
#, python-format
msgid "matches"
msgstr "ujemanj"

23
web_advanced_search_wildcard/i18n/web_advanced_search_wildcard.pot
View File

@ -1,23 +0,0 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-09-15 09:11+0000\n"
"PO-Revision-Date: 2014-09-15 11:12+0100\n"
"Last-Translator: M\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: \n"
#. module: web_advanced_search_wildcard
#. openerp-web
#: code:addons/web_advanced_search_wildcard/static/src/js/search.js:4
#, python-format
msgid "matches"
msgstr ""

BIN
web_advanced_search_wildcard/static/description/screenshot.png
View File

Side by Side

Before

Width: 532  |  Height: 135  |  Size: 7.0 KiB

6
web_advanced_search_wildcard/static/src/js/search.js
View File

@ -1,6 +0,0 @@
openerp.web_advanced_search_wildcard = function(instance){
var _lt = instance.web._lt;
instance.web.search.ExtendedSearchProposition.Char.prototype.operators.push(
{value: '=ilike', text: _lt("matches")}
);
};

10
web_advanced_search_wildcard/views/template.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<openerp>
<data>
<template id="assets_backend" name="web_advanced_search_wildcard assets" inherit_id="web.assets_backend">
<xpath expr="." position="inside">
<script type="text/javascript" src="/web_advanced_search_wildcard/static/src/js/search.js"></script>
</xpath>
</template>
</data>
</openerp>

72
web_dashboard_tile/models/tile_tile.py
View File

@ -142,24 +142,25 @@ class TileTile(models.Model):
string='Error Details',
compute='_compute_data')
@api.one
@api.multi
def _compute_data(self):
if not self.active:
for rec in self:
if not rec.active:
return
model = self.env[self.model_id.model]
model = self.env[rec.model_id.model]
eval_context = self._get_eval_context()
domain = self.domain or '[]'
domain = rec.domain or '[]'
try:
count = model.search_count(eval(domain, eval_context))
except Exception as e:
self.primary_value = self.secondary_value = 'ERR!'
self.error = str(e)
rec.primary_value = rec.secondary_value = 'ERR!'
rec.error = str(e)
return
if any([
self.primary_function and
self.primary_function != 'count',
self.secondary_function and
self.secondary_function != 'count'
rec.primary_function and
rec.primary_function != 'count',
rec.secondary_function and
rec.secondary_function != 'count'
]):
records = model.search(eval(domain, eval_context))
for f in ['primary_', 'secondary_']:
@ -168,45 +169,47 @@ class TileTile(models.Model):
f_format = f + 'format'
f_value = f + 'value'
value = 0
if self[f_function] == 'count':
if rec[f_function] == 'count':
value = count
elif self[f_function]:
func = FIELD_FUNCTIONS[self[f_function]]['func']
if func and self[f_field_id] and count:
vals = [x[self[f_field_id].name] for x in records]
elif rec[f_function]:
func = FIELD_FUNCTIONS[rec[f_function]]['func']
if func and rec[f_field_id] and count:
vals = [x[rec[f_field_id].name] for x in records]
value = func(vals)
if self[f_function]:
if rec[f_function]:
try:
self[f_value] = (self[f_format] or '{:,}').format(value)
rec[f_value] = (rec[f_format] or '{:,}').format(value)
except ValueError as e:
self[f_value] = 'F_ERR!'
self.error = str(e)
rec[f_value] = 'F_ERR!'
rec.error = str(e)
return
else:
self[f_value] = False
rec[f_value] = False
@api.one
@api.multi
@api.onchange('primary_function', 'primary_field_id',
'secondary_function', 'secondary_field_id')
def _compute_helper(self):
for rec in self:
for f in ['primary_', 'secondary_']:
f_function = f + 'function'
f_field_id = f + 'field_id'
f_helper = f + 'helper'
self[f_helper] = ''
field_func = FIELD_FUNCTIONS.get(self[f_function], {})
rec[f_helper] = ''
field_func = FIELD_FUNCTIONS.get(rec[f_function], {})
help = field_func.get('help', False)
if help:
if self[f_function] != 'count' and self[f_field_id]:
desc = self[f_field_id].field_description
self[f_helper] = help % desc
if rec[f_function] != 'count' and rec[f_field_id]:
desc = rec[f_field_id].field_description
rec[f_helper] = help % desc
else:
self[f_helper] = help
rec[f_helper] = help
@api.one
@api.multi
def _compute_active(self):
ima = self.env['ir.model.access']
self.active = ima.check(self.model_id.model, 'read', False)
for rec in self:
rec.active = ima.check(rec.model_id.model, 'read', False)
def _search_active(self, operator, value):
cr = self.env.cr
@ -226,14 +229,15 @@ class TileTile(models.Model):
return [('id', 'in', ids)]
# Constraints and onchanges
@api.one
@api.multi
@api.constrains('model_id', 'primary_field_id', 'secondary_field_id')
def _check_model_id_field_id(self):
for rec in self:
if any([
self.primary_field_id and
self.primary_field_id.model_id.id != self.model_id.id,
self.secondary_field_id and
self.secondary_field_id.model_id.id != self.model_id.id
rec.primary_field_id and
rec.primary_field_id.model_id.id != rec.model_id.id,
rec.secondary_field_id and
rec.secondary_field_id.model_id.id != rec.model_id.id
]):
raise ValidationError(
_("Please select a field from the selected model."))

Write Preview
Loading…
Cancel
Save