Bläddra i källkod

Merge branch 'develop' into fix-format-date-dashboard-charts

version-14
Suraj Shetty 3 år sedan
committed by GitHub
förälder
incheckning
2568e8a1ac
Ingen känd nyckel hittad för denna signaturen i databasen GPG-nyckel ID: 4AEE18F83AFDEB23
5 ändrade filer med 16 tillägg och 15 borttagningar
  1. +1
    -1
      frappe/client.py
  2. +2
    -3
      frappe/core/doctype/logs_to_clear/logs_to_clear.json
  3. +11
    -9
      frappe/public/js/frappe/form/sidebar/user_image.js
  4. +1
    -1
      frappe/public/js/frappe/form/tab.js
  5. +1
    -1
      frappe/public/js/frappe/utils/datetime.js

+ 1
- 1
frappe/client.py Visa fil

@@ -100,7 +100,7 @@ def get_value(doctype, fieldname, filters=None, as_dict=True, debug=False, paren
if frappe.is_table(doctype):
check_parent_permission(parent, doctype)

if not frappe.has_permission(doctype):
if not frappe.has_permission(doctype, parent_doctype=parent):
frappe.throw(_("No permission for {0}").format(doctype), frappe.PermissionError)

filters = get_safe_filters(filters)


+ 2
- 3
frappe/core/doctype/logs_to_clear/logs_to_clear.json Visa fil

@@ -1,6 +1,6 @@
{
"actions": [],
"autoname": "autoincrement",
"autoname": "hash",
"creation": "2022-06-11 02:02:39.472511",
"doctype": "DocType",
"editable_grid": 1,
@@ -35,10 +35,9 @@
"modified_by": "Administrator",
"module": "Core",
"name": "Logs To Clear",
"naming_rule": "Autoincrement",
"owner": "Administrator",
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC",
"states": []
}
}

+ 11
- 9
frappe/public/js/frappe/form/sidebar/user_image.js Visa fil

@@ -65,15 +65,17 @@ frappe.ui.form.setup_user_image_event = function(frm) {
});
}

frm.sidebar.image_wrapper.on('click', ':not(.sidebar-image-actions)', (e) => {
let $target = $(e.currentTarget);
if ($target.is('a.dropdown-toggle, .dropdown')) {
return;
}
let dropdown = frm.sidebar.image_wrapper.find('.sidebar-image-actions .dropdown');
dropdown.toggleClass('open');
e.stopPropagation();
});
if (frm.meta.image_field && !frm.fields_dict[frm.meta.image_field].df.read_only) {
frm.sidebar.image_wrapper.on('click', ':not(.sidebar-image-actions)', (e) => {
let $target = $(e.currentTarget);
if ($target.is('a.dropdown-toggle, .dropdown')) {
return;
}
let dropdown = frm.sidebar.image_wrapper.find('.sidebar-image-actions .dropdown');
dropdown.toggleClass('open');
e.stopPropagation();
});
}

// bind click on image_wrapper
frm.sidebar.image_wrapper.on('click', '.sidebar-image-change, .sidebar-image-remove', function(e) {


+ 1
- 1
frappe/public/js/frappe/form/tab.js Visa fil

@@ -78,7 +78,7 @@ export default class Tab {

set_active() {
this.parent.find('.nav-link').tab('show');
this.wrapper.addClass('show');
this.wrapper.addClass('active');
this.frm.active_tab = this;
}



+ 1
- 1
frappe/public/js/frappe/utils/datetime.js Visa fil

@@ -191,7 +191,7 @@ $.extend(frappe.datetime, {
global_date_format: function(d) {
var m = moment(d);
if(m._f && m._f.indexOf("HH")!== -1) {
return m.format("Do MMMM YYYY, h:mma")
return m.format("Do MMMM YYYY, hh:mm A");
} else {
return m.format('Do MMMM YYYY');
}


Laddar…
Avbryt
Spara