Commit graph

15818 commits

Author SHA1 Message Date
Nabin Hait
e3682cec22 Fixed merge conflict 2018-05-05 12:12:28 +05:30
Nabin Hait
947f409826 Merge branch 'hotfix' 2018-05-05 12:08:47 +05:30
Nabin Hait
00adb31d69 bumped to version 10.1.29 2018-05-05 12:38:47 +06:00
Nabin Hait
3bb36344a6 minor fix 2018-05-05 12:07:54 +05:30
Suraj Shetty
a93bc87363 Permission fixes (#5530)
* Add User Permissions to Config module

* Update Permission Manager help

* Fix share button

* Remove user-permissions page

* Remove unnecessary error modals

* User Permission UI fixes
- Fix double multicheck bug on save
- Add margin above and below select all button

* Update user_permissions dict realtime on client side

- Remove user_permissions from boot

* Cast permission dict values to int
2018-05-04 19:49:11 +05:30
Ameya Shenoy
5cc28b1257 pip fix (#5527) 2018-05-04 19:05:48 +05:30
Ameya Shenoy
dc8af84563 Login fix for python3 (#5529)
decode bytes to string
2018-05-04 18:36:27 +05:30
ci2014
8b2e4a5f4c Check for list_renderer before accessing settings (#5469)
* Check for list_renderer before accessing settings

In the master version of frappe, in the first attempt of calling the file manager (when onload is called) the report doesn't build, because in the report view, there is no such attribute list_renderer available.

In that change we check if the list renderer is not undefined and only setup the menu, drag and drop and copy function, when the list_renderer object is available.

This problem might not occur in the developer versions (datatables), but many people still work with the master version and need a working file manager report.

* Update file_list.js
2018-05-04 13:15:30 +05:30
Manas Solanki
62fe836f43 time taken by the patch along with success message (#5524) 2018-05-04 13:14:10 +05:30
Suraj Shetty
3109123249 Permission improvements (#5494)
* Overwrite "if owner" restriction*
- Overwrite "if owner" restriction if user has other valid roles
(with access rights) without if_owner enabled for it in doc perm
eg:
If a doctype has 2 docperm for Role A and Role B and the docperm with
Role A has  if owner enabled.

Suppose User 1 has Role A, then User 1 should see only docs
which was created by him.

Now if User 2 has Role A and Role B, User 2 should be able to see all the
records because Role B has unrestricted access on doctype.
------------------------------------------------------

Previously in case of User 2, the restriction(of if owner) from Role A
used to reflect and User 2 was only able to view only records made by
him.

This commit will overwrite the if_owner restriction in such case.
- Refactor get_role_permission method

* Add advanced control for user permission
- Add ability to skip user permission check for specific doctype

* Refactor "linked with" method
- Add option to skip linked with doctype which has
ignore_user_permission enabled against them.

* Clear "linked with doctype" cache on doctype changes

* [Minor] Fix formatting

* Fix error and bugs in linked_with method

* Format code

* Add fix to get allowed docs from user_permission

* Fix has_user_permission bug

* Add before migrate patch for user permission

* Fix typo
2018-05-04 13:13:29 +05:30
Prateeksha Singh
6724cf1776
Merge pull request #5200 from CodedInternet/password-hashing
Migrate password hashing away from mysql password()
2018-05-03 17:42:42 +05:30
Prateeksha Singh
d2dfda2711
Merge pull request #4973 from lasalesi/configurablepdfborder
using regex instead of soup to parse pdf page margins
2018-05-03 17:41:52 +05:30
Prateeksha Singh
329831512b
Merge pull request #5520 from netchampfaris/printview-footer
Show footer in Full Page printview
2018-05-03 17:37:20 +05:30
Prateeksha Singh
1204b67af9
Merge pull request #5481 from Zlash65/multiselect
MultiSelect field - enhance to work like link field
2018-05-03 17:04:05 +05:30
Zlash65
0f04531215 minor requested changes 2018-05-03 17:00:37 +05:30
Zlash65
e42d84bc5e use get_data to override data list 2018-05-03 17:00:37 +05:30
Zlash65
369fb8fbc6 multiselect - behave like link field 2018-05-03 17:00:37 +05:30
Faris Ansari
1cef6890e3 Show footer in Full Page printview 2018-05-03 16:12:16 +05:30
Prateeksha Singh
8cdfd6fc88
Merge pull request #5515 from rohitwaghchaure/url_encode_issue
Double encode url issue
2018-05-03 12:14:24 +05:30
Prateeksha Singh
278a6fed78
Merge pull request #5506 from manassolanki/bs4
remove bs3 js from the frappe-web.min.js and include that in base.html
2018-05-03 11:16:10 +05:30
Nabin Hait
03264d5d6a minor fix 2018-05-03 10:45:18 +05:30
Saurabh
da1e6ee789 [fix] merge conflicts 2018-05-02 21:38:06 +05:30
Saurabh
880d2e5101 Merge branch 'hotfix' 2018-05-02 21:36:12 +05:30
Saurabh
bded2cd3e9 bumped to version 10.1.28 2018-05-02 22:06:12 +06:00
Saurabh
869976b1bc
Merge pull request #5517 from codingCoffee/travis
dark magic to revive travis
2018-05-02 21:35:30 +05:30
Saurabh
7ed0621e1e
Merge pull request #5518 from netchampfaris/handle-row-dict-list
Handle row which can be dict or list
2018-05-02 21:34:28 +05:30
Faris Ansari
c8538445ab Handle row which can be dict or list
- (why no normalization?)
2018-05-02 21:29:41 +05:30
Ameya Shenoy
ab0198b513
dark magic to revive travis
It seems that some process inside travis is using port no 9000. Hence
adding this line in the travis.yml to change common_site_config.json and
use port no 9001 for socket_io
2018-05-02 17:30:35 +05:30
Saurabh
dee3a6ed1d Merge branch 'master' into develop 2018-05-02 16:18:48 +05:30
Saurabh
cef7f1c3b9 Merge branch 'hotfix' 2018-05-02 16:18:47 +05:30
Saurabh
36cfa144e6 bumped to version 10.1.27 2018-05-02 16:48:47 +06:00
Saurabh
5e489228f3
Merge pull request #5516 from surajshetty3416/hotfix
[urgent] Fix query_report has_match
2018-05-02 16:15:24 +05:30
Suraj Shetty
7cba1f41a5 [urgent] Fix query_report has_match 2018-05-02 16:06:59 +05:30
Prateeksha Singh
54a96761c1
Merge pull request #5495 from surajshetty3416/build-match-condition-fix
[Minor] Fix bug with build_match_condition
2018-05-02 16:06:47 +05:30
Rohit Waghchaure
5df1e427db Double encode url issue 2018-05-02 16:00:38 +05:30
Bassam Ramadan
adf4f3fc8c doc-img-fix (#5088) 2018-05-02 15:13:09 +05:30
Saurabh
f3a25b3f91 Merge branch 'master' into develop 2018-05-02 14:51:46 +05:30
Saurabh
c4d598cd99 Merge branch 'hotfix' 2018-05-02 14:51:45 +05:30
Saurabh
74c645b6d2 bumped to version 10.1.26 2018-05-02 15:21:45 +06:00
Saurabh
10dec5db25
Merge pull request #5513 from frappe/revert-5486-hotfix
Revert "Hotfix to allow for modal to be scrolled"
2018-05-02 13:22:17 +05:30
Saurabh
1d0fdf7dcc Revert "Hotfix to allow for modal to be scrolled (#5486)"
This reverts commit 526ebb71a3.
2018-05-02 13:18:50 +05:30
spa49
526ebb71a3 Hotfix to allow for modal to be scrolled (#5486)
* Update desk.css

* Update desk.less
2018-05-02 11:08:20 +05:30
Faris Ansari
1ccf9d85b8
get_emails_from_role should only pickup enabled users (#5504) 2018-05-02 11:02:07 +05:30
Prateeksha Singh
cccfa6657a
Merge pull request #5507 from shreyashah115/color-map
Map color field for calendar view
2018-05-01 18:51:01 +05:30
Prateeksha Singh
be8f73f551
Merge pull request #5510 from pratu16x7/hotfix
[control] code value field
2018-05-01 10:23:26 +05:30
Prateeksha Singh
7cc6f9482c [control] code value field 2018-05-01 08:21:13 +05:30
Nabin Hait
cfff0c46b2 Merge branch 'tundebabzy-new-autorepeat' into develop 2018-04-30 19:34:11 +05:30
Nabin Hait
0658f035c2 Minor fixes 2018-04-30 19:34:00 +05:30
Nabin Hait
ee022bcd30 Merge branch 'new-autorepeat' of https://github.com/tundebabzy/frappe into tundebabzy-new-autorepeat 2018-04-30 16:26:04 +05:30
Shreya
bef9338605 set color if color field in any doctype 2018-04-30 13:55:33 +05:30