Ver a proveniência

style: Fix formatting issues

version-14
Suraj Shetty há 4 anos
ascendente
cometimento
21c020e036
6 ficheiros alterados com 23 adições e 25 eliminações
  1. +2
    -6
      cypress/support/commands.js
  2. +5
    -4
      frappe/core/doctype/communication/communication.js
  3. +7
    -8
      frappe/core/doctype/doctype/test_doctype.py
  4. +6
    -4
      frappe/core/page/background_jobs/background_jobs.js
  5. +1
    -1
      frappe/core/page/dashboard_view/dashboard_view.js
  6. +2
    -2
      frappe/core/page/permission_manager/permission_manager.js

+ 2
- 6
cypress/support/commands.js Ver ficheiro

@@ -244,10 +244,7 @@ Cypress.Commands.add('awesomebar', text => {
});

Cypress.Commands.add('new_form', doctype => {
let dt_in_route = doctype.toLowerCase().replace(/ /g, '-')
// // let route = `${dt_in_route}/new-${dt_in_route}-1`;
// let route = `${dt_in_route}/new`;
// let route = `${doctype.toLowerCase().replace(' ', '-')}/new`;
let dt_in_route = doctype.toLowerCase().replace(/ /g, '-');
cy.visit(`/app/${dt_in_route}/new`);
cy.get('body').should('have.attr', 'data-route', `Form/${doctype}/new-${dt_in_route}-1`);
cy.get('body').should('have.attr', 'data-ajax-state', 'complete');
@@ -279,8 +276,7 @@ Cypress.Commands.add('get_open_dialog', () => {

Cypress.Commands.add('hide_dialog', () => {
cy.wait(200);
cy.get_open_dialog()
.find('.btn-modal-close').click()
cy.get_open_dialog().find('.btn-modal-close').click();
cy.get('.modal:visible').should('not.exist');
});



+ 5
- 4
frappe/core/doctype/communication/communication.js Ver ficheiro

@@ -99,8 +99,7 @@ frappe.ui.form.on("Communication", {
}
},

show_relink_dialog: function(frm){
var lib = "frappe.email";
show_relink_dialog: function(frm) {
var d = new frappe.ui.Dialog ({
title: __("Relink Communication"),
fields: [{
@@ -138,8 +137,10 @@ frappe.ui.form.on("Communication", {
}
});
},
function () {
frappe.show_alert({message:__('Document not Relinked'), 'indicator': 'info'})
function() {
frappe.show_alert({
message:__('Document not Relinked'), 'indicator': 'info'
});
}
);
}


+ 7
- 8
frappe/core/doctype/doctype/test_doctype.py Ver ficheiro

@@ -5,14 +5,13 @@ from __future__ import unicode_literals

import frappe
import unittest
from frappe.core.doctype.doctype.doctype import (UniqueFieldnameError,
IllegalMandatoryError,
DoctypeLinkError,
WrongOptionsDoctypeLinkError,
HiddenAndMandatoryWithoutDefaultError,
CannotIndexedError,
InvalidFieldNameError,
CannotCreateStandardDoctypeError,
from frappe.core.doctype.doctype.doctype import (UniqueFieldnameError,
IllegalMandatoryError,
DoctypeLinkError,
WrongOptionsDoctypeLinkError,
HiddenAndMandatoryWithoutDefaultError,
CannotIndexedError,
InvalidFieldNameError,
validate_links_table_fieldnames)

# test_records = frappe.get_test_records('DocType')


+ 6
- 4
frappe/core/page/background_jobs/background_jobs.js Ver ficheiro

@@ -20,10 +20,12 @@ class BackgroundJobs {
this.show_failed = false;

this.show_failed_button = this.page.add_inner_button(__("Show Failed Jobs"), () => {
this.show_failed = !this.show_failed
this.show_failed_button && this.show_failed_button.text(
this.show_failed ? __("Hide Failed Jobs") : __("Show Failed Jobs")
)
this.show_failed = !this.show_failed;
if (this.show_failed_button) {
this.show_failed_button.text(
this.show_failed ? __("Hide Failed Jobs") : __("Show Failed Jobs")
);
}
});

$(frappe.render_template('background_jobs_outer')).appendTo(this.page.body);


+ 1
- 1
frappe/core/page/dashboard_view/dashboard_view.js Ver ficheiro

@@ -183,7 +183,7 @@ class Dashboard {
frappe.db.get_list('Dashboard').then(dashboards => {
dashboards.map(dashboard => {
let name = dashboard.name;
if(name != this.dashboard_name){
if (name != this.dashboard_name) {
this.page.add_menu_item(name, () => frappe.set_route("dashboard-view", name), 1);
}
});


+ 2
- 2
frappe/core/page/permission_manager/permission_manager.js Ver ficheiro

@@ -98,7 +98,7 @@ frappe.PermissionEngine = class PermissionEngine {
}

reset_std_permissions(data) {
let doctype = this.get_doctype()
let doctype = this.get_doctype();
let d = frappe.confirm(__("Reset Permissions for {0}?", [doctype]), () => {
return frappe.call({
module: "frappe.core",
@@ -117,7 +117,7 @@ frappe.PermissionEngine = class PermissionEngine {
let rights = this.rights
.filter((r) => d[r])
.map((r) => {
return __(toTitle(frappe.unscrub(r)))
return __(toTitle(frappe.unscrub(r)));
});

d.rights = rights.join(", ");


Carregando…
Cancelar
Guardar