Commit graph

105 commits

Author SHA1 Message Date
Gavin D'souza
001075f88a fix: Use lru_cache instead of cache
* Mainly because it was introduced in PY39
* Making this change beacuse I'd like to evict cold caches too
2022-02-02 13:03:38 +05:30
Ankush Menat
5c17f9ad79
Merge pull request #15661 from gavindsouza/thumbnail-for-images
fix: Thumbnail for external images (from URL)
2022-02-02 12:21:06 +05:30
Gavin D'souza
c56b5a4899 Merge branch 'develop' of github.com:frappe/frappe into thumbnail-for-images 2022-01-31 11:26:31 +05:30
Gavin D'souza
5b6ceb5543 Merge branch 'develop' of github.com:frappe/frappe into set_value-refactor 2022-01-28 18:39:12 +05:30
Gavin D'souza
51fa09c4ab Merge branch 'develop' of github.com:frappe/frappe into thumbnail-for-images 2022-01-27 18:56:58 +05:30
Gavin D'souza
de2bcb08b4 fix!: Drop six PY2 compatibility package 2022-01-27 18:28:04 +05:30
Gavin D'souza
5503e18817 chore(typing): Add typing, style fixes
This was going to be a fix at first. Until I realised it couldn't...so I
removed the changes and kept the things back that helped me debug the
issue
2022-01-27 18:27:35 +05:30
Gavin D'souza
9dbaf252f0 fix: Check if binary file in Page Renderers
* Check if binary before rendering using StaticPage resolver
* Check if not binary before rendering using TemplatePage resolver
2022-01-19 19:30:45 +05:30
barredterra
b1383df15a refactor: use is None instead of == None 2022-01-17 10:37:51 +01:00
Gavin D'souza
3052808048 fix: Don't cast to str if None or Falsy
* refactor: use get_single_value instead of set_value(blah, None, blah1)
* User.reload in test_home_page to combat what happens locally
2022-01-10 15:05:57 +05:30
Paweł Wojciechowski
a956571d41
fix: Website URL parsing function parses absolute telephone/phone tel: URLs as relative (#14568)
* Update utils.py

Fix: #14567 

tel: URLs should be parsed as absolute path

* fix: Parsing telephone/phone tel: URLs as absolute
2021-10-26 05:34:23 +00:00
Gavin D'souza
3446026555 chore: Update header: license.txt => LICENSE
The license.txt file has been replaced with LICENSE for quite a while
now. INAL but it didn't seem accurate to say "hey, checkout license.txt
although there's no such file". Apart from this, there were
inconsistencies in the headers altogether...this change brings
consistency.
2021-09-03 12:02:59 +05:30
Mohammad Hasnain Mohsin Rajan
e87d22b244
perf: strain html before passing to bs4 (#13785) 2021-08-02 16:34:51 +05:30
Suraj Shetty
9ad276767f test: Reset no_cache flag 2021-06-24 13:30:11 +05:30
Suraj Shetty
468b8fbd99 fix: Remove unnecessary import 2021-06-03 11:48:49 +05:30
Suraj Shetty
2d8c6c1710 Merge branch 'develop' of https://github.com/frappe/frappe into refactor-website 2021-06-03 11:43:28 +05:30
Gavin D'souza
e407b78506 chore: Drop dead and deprecated code
* Remove six for PY2 compatability since our dependencies are not, PY2
  is legacy.
* Removed usages of utils from future/past libraries since they are
  deprecated. This includes 'from __future__ ...' and 'from past...'
  statements.
* Removed compatibility imports for PY2, switched from six imports to
  standard library imports.
* Removed utils code blocks that handle operations depending on PY2/3
  versions.
* Removed 'from __future__ ...' lines from templates/code generators
* Used PY3 syntaxes in place of PY2 compatible blocks. eg: metaclass
2021-05-26 15:31:29 +05:30
Gavin D'souza
e8cf96d1d3 fix: Replace cmp with different logic
cmp was being used from past.builtins library since it was deprecated in
PY2. It's hard to understand behaviour of their usages, so this is an
attempt to replicate behaviour with simpler logic, making this more
readable.

Also, removed usages of iteritems and string_types, compatibility
imports
2021-05-26 13:25:01 +05:30
Suraj Shetty
ca56b21290 test: Check all cases of setting homepage 2021-05-25 15:01:20 +05:30
Suraj Shetty
86897c1808 refactor: Remove render.py and move all utility functions to utils.py
- Replace or remove all render imports
2021-05-25 10:53:35 +05:30
Suraj Shetty
5bd8010681 style: Translate string 2021-05-20 13:24:44 +05:30
Suraj Shetty
862b5320b6 refactor: Move code to appropriate files
- Delete unused resolve_route method
- move resolve_path & resolve_redirect to path_resolver
- Remove redirect.py
2021-05-20 01:29:02 +05:30
Suraj Shetty
132434cc94 refactor: Delete unused code 2021-05-20 01:23:54 +05:30
Suraj Shetty
6375818c10 fix: 404 caching 2021-05-18 21:57:20 +05:30
Suraj Shetty
c217b32fa9 fix: Add cache_html decorator to cache HTML 2021-05-18 15:41:23 +05:30
Suraj Shetty
d6a539362d style: Fix formatting issue 2021-05-18 09:13:13 +05:30
Suraj Shetty
c8d588819f refactor: Move get_sidebar_data method to utils
- Also, rename get_sidebar_data to get_sidebar_items & delete context.py
- Remove commented text
2021-05-18 09:05:02 +05:30
Suraj Shetty
c964217106 style: Fix import issues 2021-05-14 21:40:44 +05:30
Suraj Shetty
20bab0f631 refactor: Move code to appropriate places 2021-05-14 18:58:04 +05:30
Suraj Shetty
56ee6e449c refactor: Remove render method
- also, move clear cache to utils.py
2021-05-14 14:17:52 +05:30
Prssanna Desai
ff44523b04
Merge pull request #12278 from hasnain2808/fix-auto-login-redirect 2021-02-02 14:30:25 +05:30
Faris Ansari
4ffd3c1743 fix: Dont cache homepage in development 2021-01-28 23:41:18 +05:30
hasnain2808@gmail.com
7d2227dc1c fix: auto login redirect 2021-01-28 21:47:02 +05:30
Faris Ansari
ab80058d85 fix: Set og:type to website for web page 2020-09-10 15:33:50 +05:30
Rushabh Mehta
137df8290b fix(sider): fix sider issues 2020-08-17 09:41:54 +05:30
Rushabh Mehta
b0f2af0ac5 fix(tests): add tests for home page 2020-08-17 09:41:54 +05:30
Rushabh Mehta
77018fc9d6 fix(cleanup): cleanup layout of doctype, user, role, add home_page to Portal Settings, Role 2020-08-17 09:41:54 +05:30
Faris Ansari
3b09087c5b fix: Markdown content in Blog Post
`markdown` checks if the content is html, if not, converts to markdown.
This breaks when there are html tags in markdown. Instead we can
use `md_to_html` directly.
2020-07-15 14:46:39 +05:30
prafful1234
737ecae59d
feat(website): fetch email comments in issue portal (#9657)
* feat(website): fetch email comments in issue portal

* fix: deepsource issues

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: remove unnecessary import

not sure how i missed it

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

Co-authored-by: prafful1234 <prafful@mntechnique.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-30 12:53:21 +05:30
Faris Ansari
6b282db8a0 fix: Web View Rendering
- Extract title from h1 if it doesn't contain jinja
- Add _context_dict to context to be able to inspect it in templates
- Add inspect macro to inspect any variable
- Better defaults for controller_row template

Co-Authored-By: Suraj Shetty <surajshetty3416@gmail.com>
2020-03-24 15:12:24 +05:30
Victor Munene
06f3b7a35f return empty string if title arg is falsey 2020-03-17 08:09:50 +03:00
Faris Ansari
766e26ac5f
feat: Index all web pages for search (#7322)
* feat: Index Web Pages for search

- Walks and indexes all webpages in global_search

* test: Web Page Indexing
2019-04-26 12:41:17 +05:30
Rushabh Mehta
ae097e5139 fix: tests, check for spam comments 2019-02-07 16:35:50 +05:30
Rushabh Mehta
41d90fa6d1 BREAKING CHANGE: Comments are now handled separately from Communication and Version 2019-02-07 16:35:50 +05:30
Rushabh Mehta
65d2167551 feat: various fixes to Web Form and content type selection for Web Page and Blog Post 2019-02-06 15:50:57 +05:30
Rushabh Mehta
f537d75946
feat: Allow website templates to have different base templates (#6811)
* feat: Allow website templates to have different base templates

* test: custom base template
2019-01-27 20:46:23 +05:30
Rushabh Mehta
b66d233360 merge: staging-fixes for latest test fixes 2019-01-03 15:28:36 +05:30
Shivam Mishra
b86663490c [Base 64 Fix]: Added check for base64 image in abs_url (#6688)
* [Base 64 Fix]: Added check for base64 image in abs_url

The abs_url filter used in website appends a '/' before every link.
This broke the website image display.

* fix(abs_url): add check for all image types

* Update utils.py
2019-01-02 09:11:05 +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
Achilles Rasquinha
c0f674f5e5 cmp alternative 2018-03-08 11:49:31 +05:30