Commit graph

91 commits

Author SHA1 Message Date
Rushabh Mehta
5ebf688984 fix(recent): complete uncommitted changes 2019-05-03 08:49:51 +05:30
Rushabh Mehta
7402f495d5 feat: Milestone Tracker. Track document lifecycle with milestones 2019-04-17 18:00:03 +05:30
Suraj Shetty
aee7c67f8b refactor: Move get_users_with_role to utils.user 2019-03-21 21:06:54 +05:30
Suraj Shetty
00ed1a0f1a Merge branch 'develop' of https://github.com/frappe/frappe into energy_point_new 2019-03-21 15:38:09 +05:30
Saurabh
6d9fa54f0b Merge branch 'master' into develop 2019-03-20 14:30:48 +05:30
Saurabh
4ae92edfb9 fix: do not check password strength while creating system manager 2019-03-19 14:40:29 +05:30
Suraj Shetty
3402166943 chore: Rename update_log method
- Add a field which was accidently removed
2019-03-19 14:17:06 +05:30
Suraj Shetty
56b28d0a0a feat: Init energy points 2019-03-19 14:08:35 +05:30
Nabin Hait
6e659653a9 fix: filter object to list 2019-02-08 12:27:00 +05:30
Saurabh
b727233948 Merge branch 'staging' into develop 2018-12-13 10:37:25 +05:30
Saurabh
5dceb7fb42 provision to setup password while adding system manager 2018-12-11 16:10:02 +05:30
Ameya Shenoy
63c5613f92
Merge branch 'staging' into develop 2018-10-11 10:11:26 +00:00
Saurabh
cdc2e17cbf get link to reset password only if setup wizard is not completed 2018-10-11 14:39:52 +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
Suraj Shetty
ba91496378 Permission fixes (#5368)
* ui-fixes
- change help text
- remove if owner description and change label to Only If Creator
- adjust icon size (restricted list)
- add tags.less in build json

* remove block module for user check

* label change for module access
Rename module access section to desktop in user doctype to avoid confusion
2018-04-04 12:54:18 +05:30
Suraj Shetty
0be4342649 User permissions redux (#5314)
* [start] removing simpler user permission structure

* permission changes
removed "apply user permission" from has_permission

* test fixes and other supporting fixes

* Removed Apply user permission code

* additional check to see if user has some user permissions related to a doctype

* test fixes

* removed a test

* Permission changes
- Code to restrict access if module is blocked for user.
- [Fix] ignore user perm if applicable

* List view restrictions ui changes

* removed unwanted apply user perm code

* permission (block module fix)

* permission fix

* change user permission
user permission will not be applied if user doesn't have role permission

* removed left "apply_user_permissions" property

* add user permission help template

* perm js refactor

* ui / ux changes
restrict list view before entering view if user is not permitterd
add description for if owner check in role permission manager

* codacy fixes

* permission code fix
add controller permission check
add blocked module check in build_permission

* optimized get blocked module method
2018-04-03 10:42:04 +05:30
Rushabh Mehta
fdb8e7d7b3 Merge pull request #3976 from rmehta/domain-restrict-fix
[fix] restrict domains, fixes frappe/erpnext#9813, frappe/erpnext#10235
2017-08-24 18:30:40 +05:30
Rushabh Mehta
6b45f8a988 [minor] send me a copy is sticky, fixes frappe/erpnext#2367 (#3974) 2017-08-23 18:19:20 +05:30
Rushabh Mehta
09a31f5ec0 [fix] tests 2017-08-23 15:37:08 +05:30
Rushabh Mehta
7a589a3bc2 [fix] restrict domains, fixes frappe/erpnext#9813, frappe/erpnext#10235 2017-08-23 13:14:29 +05:30
Makarand Bauskar
9daa7b3751 [domainify] hide restrict to domain modules from modules page (#3677)
* [domainify] hide restrict to domain modules from modules page

* [minor] cleared the domainification cache and other minor fixes

* Update test_domainification.py
2017-07-18 12:29:57 +05:30
tundebabzy
6fbe20caaa Except and raise statement python 3 compatible style (#3216)
* changes exception and raise statements to python 3 style

* changes except statement to python 3 style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* changes except and raise statement to python 3 compatible style

* adds six.reraise to fix python 3 style raise statements with traceback

* fixes indentation
2017-05-11 10:51:59 +05:30
Rushabh Mehta
dd066c3c15 [revert] hide modules on basis of all 2017-04-18 12:28:22 +05:30
Rushabh Mehta
50c1efc21f [minor] added frappe.boot.user.can_be_listed_in_module 2017-04-18 11:44:22 +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
Rohit Waghchaure
e996fd0c55 Changed tabUserRoel to tabHas Role 2017-03-06 14:42:14 +05:30
Rohit Waghchaure
e57e9f170b [Enhancement] Provision to add roles in the report 2017-03-06 14:38:54 +05:30
Nabin Hait
2e0ef33647 Merge branch 'master' into develop 2017-02-28 18:42:07 +05:30
Rushabh Mehta
488cff68bc [minor] update mixpanel analytics 2017-02-28 18:41:16 +05:30
Rushabh Mehta
33d8db6d88 [fix] minor fixes 2017-02-03 16:42:23 +05:30
Rushabh Mehta
3f91c9455f [enhance] custom perms 2017-01-11 17:34:55 +05:30
Nabin Hait
ec42dcd4f7 minor fix for function import 2016-12-28 12:17:32 +05:30
Saurabh
f246cc3810 [fix] reset simultaneous sessions after disabling users 2016-12-27 19:20:17 +05:30
Nabin Hait
f2bc961e1b Fixed merge conflict 2016-12-23 17:35:38 +05:30
Saurabh
0577fcff3b [fix] exclude one user with system manger role while pulling active users list 2016-12-21 13:31:37 +05:30
Saurabh
b627342a9b [fix] testcase fix for deactivating additional users after limit set 2016-12-21 12:34:28 +05:30
Saurabh
86ebaf22aa [fix] dissable additiona users by creation date 2016-12-21 12:34:28 +05:30
Rushabh Mehta
1f8f1ef2dc [fix] filter can_import with can_create, fixes frappe/erpnext#6966 2016-12-21 11:39:05 +05:30
Nabin Hait
958d8ea6c0 Merge branch 'master' into develop 2016-12-08 12:32:20 +05:30
robert schouten
acfb0996cf hide disabled reports (#2427)
* hide disabled reports

* Update moduleview.py
2016-12-07 14:40:39 +05:30
Saurabh
6b3bf22462 [enhance] set last active time to user 2016-11-22 12:12:34 +05:30
Rushabh Mehta
a256e029b6 [minor] UI fixes (#2345) 2016-11-21 13:29:36 +05:30
Saurabh
68c7b14674 [enhance] set last active time to user 2016-11-10 14:40:12 +05:30
Kanchan Chauhan
9864a5a5b7 Disables reports will not show up in list view 2016-10-24 16:54:28 +05:30
KanchanChauhan
96e8be443e user can update image from website (#2089) 2016-09-23 21:14:18 +05:30
Rushabh Mehta
9570eecc4d [fix] setup wizard redesign for schools 2016-07-21 16:01:37 +05:30
Anand Doshi
26eafaec13 [fix] Prompt naming and add-system-manager --send-welcome-email 2016-06-27 17:09:41 +05:30
Anand Doshi
3854bcad04 [fix] limits variables and how usage is stored within limits + additional fixes 2016-06-25 17:41:19 +05:30
Rushabh Mehta
b6e8e01181 [enhance] web forms are now first class 2016-06-24 16:40:28 +05:30