[MERGE] forward port branch 9.0 up to ce038f5d15
This commit is contained in:
@@ -16,7 +16,7 @@
|
||||
<field name="auth_endpoint">https://www.facebook.com/dialog/oauth</field>
|
||||
<field name="scope">public_profile,email</field>
|
||||
<field name="validation_endpoint">https://graph.facebook.com/me</field>
|
||||
<field name="data_endpoint"></field>
|
||||
<field name="data_endpoint">https://graph.facebook.com/me?fields=id,name,email</field>
|
||||
<field name="css_class">fa fa-facebook-square</field>
|
||||
<field name="body">Log in with facebook</field>
|
||||
</record>
|
||||
|
||||
@@ -301,7 +301,7 @@ var PosDB = core.Class.extend({
|
||||
search_partner: function(query){
|
||||
try {
|
||||
query = query.replace(/[\[\]\(\)\+\*\?\.\-\!\&\^\$\|\~\_\{\}\:\,\\\/]/g,'.');
|
||||
query = query.replace(' ','.+');
|
||||
query = query.replace(/ /g,'.+');
|
||||
var re = RegExp("([0-9]+):.*?"+query,"gi");
|
||||
}catch(e){
|
||||
return [];
|
||||
|
||||
Reference in New Issue
Block a user