Quellcode durchsuchen

[fix] rename doc and slickgrid empty background color

version-14
Anand Doshi vor 10 Jahren
Ursprung
Commit
867a305e57
3 geänderte Dateien mit 16 neuen und 8 gelöschten Zeilen
  1. +14
    -8
      frappe/model/rename_doc.py
  2. +1
    -0
      frappe/public/css/desk.css
  3. +1
    -0
      frappe/public/less/desk.less

+ 14
- 8
frappe/model/rename_doc.py Datei anzeigen

@@ -136,13 +136,15 @@ def update_link_field_values(link_fields, old, new, doctype):
where doctype=%s and field=%s and value=%s""",
(new, field['parent'], field['fieldname'], old))
else:
if field['parent']!=new:
frappe.db.sql("""\
update `tab%s` set `%s`=%s
where `%s`=%s""" \
% (field['parent'], field['fieldname'], '%s',
field['fieldname'], '%s'),
(new, old))
# because the table hasn't been renamed yet!
parent = field['parent'] if field['parent']!=new else old

frappe.db.sql("""\
update `tab%s` set `%s`=%s
where `%s`=%s""" \
% (parent, field['fieldname'], '%s',
field['fieldname'], '%s'),
(new, old))

def get_link_fields(doctype):
# get link fields from tabDocField
@@ -305,9 +307,13 @@ def rename_dynamic_links(doctype, old, new):
frappe.db.sql("""update tabSingles set value=%s where
field=%s and value=%s and doctype=%s""", (new, df.fieldname, old, df.parent))
else:
# because the table hasn't been renamed yet!
parent = df.parent if df.parent != new else old

# replace for each value where renamed
for to_change in frappe.db.sql_list("""select name from `tab{parent}` where
{options}=%s and {fieldname}=%s""".format(**df), (doctype, old)):
{options}=%s and {fieldname}=%s""".format(parent=parent, options=df.options,
fieldname=df.fieldname), (doctype, old)):

frappe.db.sql("""update `tab{parent}` set {fieldname}=%s
where name=%s""".format(**df), (new, to_change))

+ 1
- 0
frappe/public/css/desk.css Datei anzeigen

@@ -766,6 +766,7 @@ th.fc-widget-header {
border: none !important;
outline: none !important;
border-top: 1px solid #d1d8dd !important;
background-color: #fafbfc !important;
}
.grid-report .show-zero {
margin: 10px;


+ 1
- 0
frappe/public/less/desk.less Datei anzeigen

@@ -920,6 +920,7 @@ th.fc-widget-header {
border: none !important;
outline: none !important;
border-top: 1px solid @border-color !important;
background-color: @light-bg !important;
}

.grid-report .show-zero {


Laden…
Abbrechen
Speichern