Pārlūkot izejas kodu

Merge branch 'develop' into format-currency-in-dashboard-chart

version-14
Suraj Shetty pirms 4 gadiem
committed by GitHub
vecāks
revīzija
563c726437
Šim parakstam datu bāzē netika atrasta zināma atslēga GPG atslēgas ID: 4AEE18F83AFDEB23
2 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. +1
    -1
      cypress/integration/table_multiselect.js
  2. +1
    -1
      frappe/desk/doctype/dashboard_chart/dashboard_chart.js

+ 1
- 1
cypress/integration/table_multiselect.js Parādīt failu

@@ -45,6 +45,6 @@ context('Table MultiSelect', () => {
cy.get(`.list-subject:contains("table multiselect")`).last().find('a').click();
cy.get('.frappe-control[data-fieldname="users"] .form-control .tb-selected-value').as('existing_value');
cy.get('@existing_value').find('.btn-link-to-form').click();
cy.location('pathname').should('contain', '/user/test%40erpnext.com');
cy.location('pathname').should('contain', '/user/test@erpnext.com');
});
});

+ 1
- 1
frappe/desk/doctype/dashboard_chart/dashboard_chart.js Parādīt failu

@@ -204,7 +204,7 @@ frappe.ui.form.on('Dashboard Chart', {
{label: __('Last Modified On'), value: 'modified'}
];
let value_fields = [];
let group_by_fields = [];
let group_by_fields = [{label: 'Created By', value: 'owner'}];
let aggregate_function_fields = [];
let update_form = function() {
// update select options


Notiek ielāde…
Atcelt
Saglabāt