Commit graph

43 commits

Author SHA1 Message Date
Rushabh Mehta
2155c52d36 fix: link selection relevance 2019-04-16 15:38:00 +05:30
Nabin Hait
8c91e46563 Fixed merge conflict 2019-04-11 11:56:37 +05:30
Rohit Waghchaure
fdb71ae10f feat: Added more button in advance search widget 2019-04-09 15:40:44 +05:30
Frappe Bot
0499b4a845 Merge branch 'staging' into develop 2018-12-26 12:03:03 +00:00
Suraj Shetty
e79cfc531a Merge branch 'staging-fixes' of https://github.com/frappe/frappe into staging-fixes 2018-11-21 13:18:33 +05:30
Frappe Bot
478e60fdb1 Merge branch 'staging' into develop 2018-11-09 10:18:33 +00:00
Frappe Bot
c373a172af Merge branch 'master' into staging-fixes 2018-11-09 10:08:19 +00:00
Navdeep Ghai
36c6552fe9 remove meta dependency when Link field options is [Select] (#6418) 2018-11-09 10:51:09 +05:30
Suraj Shetty
0ffa645e10 Fixes to support new changes with user permission 2018-11-01 21:18:15 +05:30
Rushabh Mehta
2e6a202652 Postgres support for Frappe (#5919)
* [start] postgres

* [wip] started refactoring db_schema

* Add psycopg2 to requirements.txt

* Add support for Postgres SQL

- Separate frameworkSQL, database, schema, setup_db file for
mariaDB and postgres
- WIP

* Remove quotes from sql to make it compatible with postgres as well

* Moved some code from db_schema to database.py

* Move code from db_schema to schema.py

Add other required refactoring

* Add schema chages

* Remove redundant code in file

* Add invalid column name exception class to exceptions.py

* Add back tick in query wherever needed and replace ifnull with coalesce

* Update get_column_description code in database.py file

* Remove a print statement

* Add keys to get on_duplicate query

* Add bactick wherever necessary

- Remove db_schema.py file

* Remove DATE_SUB as it is incompatible with postgres

- Fix prepare_filter_condition

* Add backtick and quotes wherever necessary
- Move get_database_size to frappe.db namespace
- fix some left out bugs and errors

* Add code to create key and unique index
- added mysql and posgres in their respective database.py

* Add more bacticks in queries and fix some errors
- Pass keys to on_duplicate_update method
- Replace MONTH with EXTRACT function
- Remove DATEDIFF and CURDATE usage

* Cast state value to int in toggle_two_factor_auth
- since two_factor_auth has the datatype of Int

* Refactor
- Replace Timediff with normal arithmetic operator
- Add MAX_COLUMN_LENGTH
- Remove Redundant code
- Add regexp character constant
- Move create_help_table to database.py
- Add get_full_text_search_condition method
- Inherit MariaDBTable from DBTable

* Replace Database instance with get_db method

* Move db_manager to separate file

* Refactor
- Remove some unwanted code
- Separate alter table code for postgres and mysql
- Replace data_type with column_type in database.py

* Make fulltext search changes in global_search.py

* Add empty string check

* Add root_password to site config

* Create cli command for postgres console

* Move setup of help database to setup_db.py

* Add get_database_list method

* Fix exception handling
- Replace bad_field handler with missing_column handler

* Fix tests and sql queries

* Fix import error

* Fix typo db -> database

* Fix error with make_table in help.py

* Try test for postgres

* Remove pyhton 2.7 version to try postgres travis test

* Add test fixes

* Add db_type to the config of test_site_postgres

* Enable query debug to check the reason for travis fail

* Add backticks to check if the test passes

* Update travis.yml
- Add postgres addon

* Try appending 'd_' to hash for db_name
- since postgres does not support dbname starting with a number

* Try adding db_type for global help to make travis work

* Add print statements to debug travis failure

* Enable transaction and remove debug flag

* Fix help table creation query (postgres)

* Fix import issue

* Add some checks to prevent errors
- Some doctypes used to get called even before they are created

* Try fixes

* Update travis config

* Fix create index for help table

* Remove unused code

* Fix queries and update travis config

* Fix ifnull replace logic (regex)

* Add query fixes and code cleanup

* Fix typo
- get_column_description -> get_table_columns_description

* Fix tests
- Replace double quotes in query with single quote

* Replace psycopg2 with psycopg2-binary to avoid warnings
- http://initd.org/psycopg/docs/install.html#binary-install-from-pypi

* Add multisql api

* Add few multisql queries

* Remove print statements

* Remove get_fulltext_search_condition method and replace with multi query

* Remove text slicing in create user

* Set default for 'values' argument in multisql

* Fix incorrect queries and remove few debug flags
- Fix multisql bug

* Force delete user to fix test
- Fix Import error
- Fix incorrect query

* Fix query builder bug

* Fix bad query

* Fix query (minor)

* Convert boolean text to int since is_private has datatype of int
- Some query changes like removed double quotes
and replace with interpolated string to pass multiple
value pass in one of the query

* Extend database class from an object to support python 2

* Fix query
- Add quotes around value passed to the query for variable comparision

* Try setting host_name for each test site
- To avoid "RemoteDisconnected" error while testing data migration test
- Update travis.yml to add hosts
- Remove unwanted commit in setup_help_database

* Set site hostname to data migration connector (in test file)
- To connect the same site host

* Fix duplicate entry issue
- the problem is in naming series file.
In previous commits I unknowingly changed a part of a series query
due to which series were not getting reset

* Replace few sql queries with orm methods

* Fix codacy

* Fix 'Doctype Sessions not found' issue

* Fix bugs induced during codacy fixes

* Fix Notification Test

- Use ORM instead of raw sql

* Set Date fallback value to 0001-01-01

- 0000-00-00 is invalid date in Postgres
- 0001-01-01 works in both

* Fix date filter method

* Replace double quotes with single quote for literal value

* Remove print statement

* Replace double quotes with single

* Fix tests

- Replace few raw sql with ORM

* Separate query for postgres

- update_fields_to_fetch_query

* Fix tests

- replace locate with strpos for postgres

* Fix tests

- Skip test for datediff
- convert bytes to str in escape method

* Remove TestBot

* Skip fieldname extraction

* Replace docshare raw sql with ORM

* Fix typo

* Fix ancestor query test

* Fix test data migration

* Remove hardcoded hostname

* Add default option and option list for db_type

* Remove frappe.async module

* Remove a debug flag from test

* Fix codacy

* fix import issue

* Convert classmethod to static method

* Convert few instance methods to static methods

* Remove some unused imports

* Fix codacy

- Add exception type
- Replace few instance methods with static methods
- Remove unsued import

* Fix codacy

* Remove unused code

* Remove some unused codes

- Convert some instance methods to static function

* Fix a issue with query modification

* Fix add_index query

* Fix query

* Fix update_auth patch

* Fix a issue with exception handling

* Add try catch to a reload_doc

* Add try-catch to file_manager_hook patch

* import update_gravatar to set_user_gravatar patch

* Undo all the wrong patch fixes

* Fix db_setup code 😪
- previously it was not restoring db from source SQL
which is why few old patched were breaking
(because they were getting different schema structure)

* Fix typo !

* Fix exception(is_missing_column) handling

* Add deleted code
- This code is only used in a erpnext patch.
Can be moved to that patch file

* Fix codacy

* Replace a mariadb specific function in a query used in validate_series

* Remove a debug flag

* Revert changes (rename_parent_and_child)

* Fix validate_one_root method

* Fix date format issue

* Fix codacy
- Disable a pylint for variable argument warning
- Convert an instance method to static method

* Add bandit.yml

The Codacy seems to use Bandit which generates
warning for every subprocess import and its usage during pytest
Since we have carefully used subprocess (avoided user input),
warnings needs to be avoided.
This can be removed if we have any alternative for subprocess usage.

* Skip start_process_with_partial_path check

* Fix typo

* Add python 2.7 test

* Move python versions in travis.yml

* Add python versions to jobs

* Overwrite python version inheritance for postgres in travis.yml

* Add quotes around python version in .travis.yml

* Add quotes around the name of the job

* Try a travis fix

* Try .travis.yml fix

* Import missing subprocess

* Refactor travis.yml

* Refactor travis.yml
- move install and tests commands to separate files
- Use matrix to build combination of python version and db type

* Make install.sh and run-tests.sh executable

* Add sudo required to travis.yml to allow sudo cmmands in shell files

* Load nvm

* Remove verbose flag from scripts

* Remove command-trace-print flag

* Change to build dir in before script

* Add absolute path for scripts

* Fix tests

* Fix typo

* Fix codacy
- fixes - "echo won't expand escape sequences." warning

* Append (_) underscore instead of 'd' for db_name

* Remove printf and use mysql execute flag
2018-09-21 10:20:48 +05:30
Charles-Henri Decultot
dab491e55f Doctype links in foreign language (#5745)
* Doctype search in foreign language

* List comprehension slightly faster

* Remove obsolete comment

* Remove trailing whitespace

* Test case for address and contact query

* Refactor search and add tests

* Travis test debug

* Remove debug print

* Search limit removal for untranslated docs and tests refactor

* Remove old comments

* Test modification for Travis

* remove unused import

* Correct Role doctype
2018-08-24 15:23:20 +05:30
Saurabh
176f3b6a15 Resolved merge conflicts 2018-07-18 16:20:06 +05:30
Saurabh
081b17fbe8 [security][fix] tighten criteria to prevent sql injection in search-f… (#5800)
* [security][fix] tighten criteria to prevent sql injection in search-fields

* test cases
2018-07-11 11:04:51 +05:30
Saurabh
a135c6c431 resolved merge conflicts 2018-07-06 13:37:51 +05:30
Suraj Shetty
644ab216ce Check if permission needs to be ignored in link fields (#5747) 2018-06-29 15:53:53 +05:30
Saurabh
e9cdf322c6 [security][fix] Sanitize search fields to avoid sql injection (#5713)
* [security][fix] Sanitize search fields to avoid sql injection

* Test Cases for Sanitizer

* Test Cases fix

* [fix] test case
2018-06-25 11:23:32 +05:30
Rafael Perelló Rowley
eba4f4afe1 Update search.py (#5409)
Attending to the comment "In order_by, `idx` gets second priority, because it stores link count" i changed the order in the SQL statement in the order_by variable so the order_by based on meta is before the order_by idx
2018-04-09 11:18:42 +05:30
Sagar Vora
41ddc37934 [fix] explicit order clause to prevent ambiguity (#5172) 2018-03-12 10:51:17 +05:30
Aditya Hase
769338f136 Replaced all instances of basestring with six.string_types 2017-08-11 00:10:11 +05:30
almeidapaulopt
374f85bfd6 several throw translations (#3441)
* several throw translations

* small fix

* codacy fixes

* fix import _

* Create file_list.js

* Create feedback.py
2017-06-13 14:32:47 +05:30
Prateeksha Singh
eaacdb097c [multiselect]Add search term, filter by date range, pagination (#3333)
* add search term, filter by date range, pagination

* filters on the same row, ellipsis, translate msg

* Rename page_len to page_length
2017-05-19 11:08:05 +05:30
Nabin Hait
7242128dd9 Show results based on get_query method, process based on dict (#3320) 2017-05-17 13:52:07 +05:30
Prateeksha Singh
b23aa1446b Multiselect dialog for getting items (#3255)
* First approach by making a control

* Implement multi select for child tables

* Basic UI and items fetch in place

* Multiselect with checkboxes

* Functional modal with filters and new_doc

* Map filter fields to target_doc

* pass json arrays instead of strings

* Get items from quotation (in SO) working

* [minor] fix link route in list

* [minor] cleanup

* Add date, select first by default

* map_docs test, default date field

* [minor][fix] make new button bug

* [minor] move map_docs to erpnext

* [minor] format dates
2017-05-15 11:29:41 +05:30
Nabin Hait
7fe50c885a Merge branch 'master' into develop 2017-03-09 14:59:02 +05:30
Rushabh Mehta
614098a84a [fixes] mandatory css in grids, better welcome email 2017-03-08 22:52:54 +05:30
Nabin Hait
9fac886ed8 In search query consider sort_field from meta (#2515) 2016-12-29 10:47:14 +05:30
Rushabh Mehta
74919b99a0 [enhancement] remember list settings - sort, filters, paging 2016-05-30 18:19:47 +05:30
Maxwell Morais
4fcc6502d7 Fix TypeError
Traceback (innermost last):
  File "/usr/frappe5/frappe-bench/apps/frappe/frappe/app.py", line 57, in application
    response = frappe.handler.handle()
  File "/usr/frappe5/frappe-bench/apps/frappe/frappe/handler.py", line 19, in handle
    execute_cmd(cmd)
  File "/usr/frappe5/frappe-bench/apps/frappe/frappe/handler.py", line 36, in execute_cmd
    ret = frappe.call(method, **frappe.form_dict)
  File "/usr/frappe5/frappe-bench/apps/frappe/frappe/__init__.py", line 808, in call
    return fn(*args, **newargs)
  File "/usr/frappe5/frappe-bench/apps/frappe/frappe/desk/search.py", line 13, in search_link
    search_widget(doctype, txt, query, searchfield=searchfield, page_len=page_len, filters=filters)
  File "/usr/frappe5/frappe-bench/apps/frappe/frappe/desk/search.py", line 93, in search_widget
    as_list=not as_dict)
  File "/usr/frappe5/frappe-bench/apps/frappe/frappe/desk/reportview.py", line 17, in execute
    return DatabaseQuery(doctype).execute(*args, **kwargs)
 TypeError: execute() got an unexpected keyword argument 'as_dict'
2016-04-07 15:09:53 -03:00
Rushabh Mehta
3d7b9cfe77 [minor] add_custom_button in grid and link query cleanup 2016-04-07 15:25:30 +05:30
Rushabh Mehta
61218f7a80 Merge pull request #1661 from rmehta/link-count
[enhancement] count number of times a link is used and show most popular links on thei top
2016-03-30 13:16:04 +05:30
Rushabh Mehta
472b22e5c7 [minor] limit search results to 10 in link query 2016-03-22 19:10:17 +05:30
Rushabh Mehta
8b20788579 [enhancement] count number of times a link is used and show most popular links on thei top 2016-03-11 14:32:25 +05:30
Rushabh Mehta
8d0452a476 [fix] [minor] sort by default in search_link, fixes frappe/erpnext#4404 2015-12-02 12:23:41 +05:30
Anand Doshi
357e61f9d5 [fix] injection 2015-11-17 18:27:29 +05:30
Rushabh Mehta
9fbd12f5af [file-manager] fixed breadcrumbs and routing 2015-09-21 15:41:34 +05:30
Rushabh Mehta
2f7f4542e8 [minor] workflow in non-single, non-table & get_query fix 2015-08-24 13:51:13 +05:30
Rushabh Mehta
f6fa45a735 [fix] frappe/erpnext#2992 2015-04-02 14:28:32 +05:30
Rushabh Mehta
c6157bdc7a [fixes] added block_module to user, grid download / upload fixes, updated user permissions, fixed breadcrumbs if no module permissionsm, search_query for User 2015-03-24 17:34:23 +05:30
Anand Doshi
2995f02f3b Web Notes to Frappe, better alerts, css fixes, fixed splash 2015-03-03 15:09:34 +05:30
Nabin Hait
3156d64429 build search_widget query based on search_fields value 2015-02-26 18:34:32 +05:30
Anand Doshi
a1290bbdab Website Theme 2015-02-23 22:13:38 +05:30
Nabin Hait
508c4fc64b Fixed Conflict while merging v4 to v5 2015-02-10 17:20:39 +05:30
Rushabh Mehta
5a0a9aac66 [refactor] frappe.widgets > frappe.desk 2014-09-29 12:21:12 +05:30
Renamed from frappe/widgets/search.py (Browse further)