Commit graph

42389 commits

Author SHA1 Message Date
mergify[bot]
d1d30e6451
Merge pull request #18877 from marination/get_role_permissions-js-consistency
fix: Correctness in `get_role_permissions` and `has_perm` JS APIs
2022-11-21 12:56:30 +00:00
Shariq Ansari
58a35d12bf
Merge branch 'develop' into phone-field-in-web-form 2022-11-21 18:26:11 +05:30
Shariq Ansari
cf4d55855d fix: added phone field in webform 2022-11-21 18:16:44 +05:30
Sagar Vora
b8e7deea40 chore: revert to doctype_perm cache for now 2022-11-21 18:07:40 +05:30
Shariq Ansari
5605e9dbcb
Merge pull request #18960 from shariquerik/web-form-get-fields-fix 2022-11-21 17:36:46 +05:30
Shariq Ansari
962d96c1a6 fix: only get fields which is not already in webform fields table 2022-11-21 17:33:39 +05:30
Sagar Vora
e10a3d0b8d chore: move cheaper condition first 2022-11-21 17:30:32 +05:30
Sagar Vora
6e896aa412 fix: decorator usage 2022-11-21 17:17:18 +05:30
Sagar Vora
8003b907c1 chore: cache role_perms instead 2022-11-21 17:11:34 +05:30
marination
4cd80bd279 fix: Avoid caching unsaved documents and secure whitelist decorator
- Avoid caching documents like 'new-item-1', default to doctype perms instead
- Use secure `whitelist_for_tests` decorator instead
2022-11-21 16:41:37 +05:30
marination
0937c962a7 chore: web_form.py format via pre-commit 2022-11-21 16:18:58 +05:30
Marica
209ecd02fb
Merge branch 'develop' into get_role_permissions-js-consistency 2022-11-21 15:38:33 +05:30
marination
d529b2a64e chore: Cache Document level perms as well in has_perm
- Cache documet level output of `get_perm` in `has_perm` as well
2022-11-21 15:32:39 +05:30
Shariq Ansari
c56c71b1e0
Merge pull request #18945 from theopen-institute/oi-webform-error 2022-11-21 15:25:58 +05:30
PeterG
4ec7d2dbba
feat(minor): redirect after login from NotPermittedPage (#18946)
* redirect after login from NotPermittedPage
2022-11-21 14:56:18 +05:30
Ankush Menat
e594c35a3a fix: show fields without labels in print format builder (#18939)
* fix: show fields without labels in print format builder

* refactor: dont hardcode layout fields

[skip ci]

Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>

Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
2022-11-21 14:52:31 +05:30
PeterG
cfa9ed4fa0
Update frappe/website/doctype/web_form/web_form.py
Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
2022-11-21 15:06:17 +05:45
PeterG
264c9dfad0
Update frappe/website/doctype/web_form/web_form.py
Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
2022-11-21 15:06:06 +05:45
PeterG
8cbfc36f65
fix: update-password api call (#18943)
[skip ci]
2022-11-21 14:13:03 +05:30
Marica
eec7a7fd13
Merge branch 'develop' into get_role_permissions-js-consistency 2022-11-21 14:03:17 +05:30
marination
ed2804d1c5 test: Cypress test to check basic has_perm and get_perm JS APIs
- Test removes System Manager role for user and expects certain perms
- On Kanban Board DocType, only System Manager is allowed to print/export/email/report/share
- DocType level test only
2022-11-21 13:41:04 +05:30
PeterG
4ffd454c04
[fix] clearer webform error 2022-11-20 16:07:07 +05:45
PeterG
7bde45ae60 [fix] clearer webform error 2022-11-20 10:13:34 +00:00
Shariq Ansari
63a69e44d8
Merge pull request #18919 from shariquerik/field-help-link 2022-11-19 12:12:04 +05:30
Shariq Ansari
220dbf3267
Merge pull request #18893 from maharshivpatel/fix-z-index
fixes https://github.com/frappe/frappe/issues/18811
2022-11-19 12:11:28 +05:30
Maharshi Patel
9bbac0f84f fix: update z-index considering sticky tabs 2022-11-18 21:31:37 +05:30
Shariq Ansari
aa3794a489 revert: unused css 2022-11-18 15:33:23 +05:30
Shariq Ansari
799e22a6cf fix: update z-index 2022-11-18 15:31:24 +05:30
Shariq Ansari
64d39ee18a fix: dont show link for fields without label 2022-11-18 15:04:53 +05:30
Mohammad Hussain Nagaria
dae4d57bed
fix: get_title must return string (#18926)
* which was not the case with autoincrement name rule
* only apparent when you set the "Image Field" in form settings
2022-11-18 13:15:34 +05:30
Sagar Vora
ff1c9be33b fix: correct logic for if_owner and refactor 2022-11-18 01:02:05 +05:30
Faris Ansari
74bce62c62
Merge pull request #18841 from netchampfaris/app-include-site-config 2022-11-17 21:13:11 +05:30
marination
8d31e702e8 fix: Kanban Board Menu Items Accessibility via perms
- Save Filters and Delete Board btns render if 'write' and 'delete' perms exist on Kanban Board
- `Create Kanban Board` renders only if 'create' perms exist on Kanban Board
- Bind board permisions to `board_perms` property of board object
- Get perms via backend call at board initialization, as frontend does not have document object (only doctype meta and perms are cached)
2022-11-17 18:46:45 +05:30
Ankush Menat
f488a4953f
chore: validate ui test helpers at runtime (#18922)
[skip ci]
2022-11-17 18:17:22 +05:30
Shariq Ansari
eb5f50e36a
Merge branch 'develop' into field-help-link 2022-11-17 18:06:01 +05:30
Shariq Ansari
25cf0d8b62
Merge pull request #18925 from shariquerik/set-route-option-in-localstorage 2022-11-17 18:05:49 +05:30
Shariq Ansari
c686671b15 fix: set route options in local storage if open in new tab 2022-11-17 17:42:28 +05:30
mergify[bot]
d57182f9e8
Merge pull request #18875 from gavindsouza/socket_io-refactor
refactor: Socket.IO
2022-11-17 11:51:15 +00:00
Gavin D'souza
40df601a73 fix: Auto-add all users to website room
Keep website room open for all - currently only used for discussions
2022-11-17 17:04:07 +05:30
Ankush Menat
9dbccc98cb chore: conflicts 2022-11-17 16:48:21 +05:30
Ankush Menat
dcdc22b53f build: pin pyopenssl
(cherry picked from commit f70db1f5397e1b1795cc3ac957bb9b2519d4341f)

# Conflicts:
#	pyproject.toml
2022-11-17 16:48:21 +05:30
Shariq Ansari
547cdcf567
Merge pull request #18910 from shariquerik/cmd+click-for-div
Fixes https://github.com/frappe/frappe/issues/18788
2022-11-17 16:39:28 +05:30
Shariq Ansari
e78c74cbc1 feat: inline doc link for each field 2022-11-17 16:19:35 +05:30
rohitwaghchaure
d0a872cc1d
Merge pull request #18913 from rohitwaghchaure/indicator-not-working-for-user-configured-columns
fix: grid column indicators not working
2022-11-17 15:46:50 +05:30
gavin
dbed3e4788
Merge branch 'develop' into socket_io-refactor 2022-11-17 15:21:20 +05:30
gavin
862a5a398d fix(socketio): Revert irrelevant & unused changes
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2022-11-17 15:20:00 +05:30
Rohit Waghchaure
54a85d0636 fix: grid column indicators not working 2022-11-17 15:05:51 +05:30
Faris Ansari
edf01ee1cd
fix(file): attached_to_name can be an integer (#18909)
* fix(file): attached_to_name can be an integer

incorrect validation introduces via
https://github.com/frappe/frappe/pull/18880

* test(file): set correct fieldname

* fix: check for str, int explicitly
2022-11-17 14:43:03 +05:30
Shariq Ansari
8e0e2dad51 fix: (ctrl/cmd)+click for clickable divs 2022-11-17 13:59:56 +05:30
Sagar Vora
f3c00c2bdc
perf: dont fetch meta unless required (#18907) 2022-11-17 13:15:35 +05:30