Procházet zdrojové kódy

[hot-fix] fix test and print format

version-14
Rushabh Mehta před 8 roky
rodič
revize
0f6420517a
2 změnil soubory, kde provedl 9 přidání a 5 odebrání
  1. +5
    -5
      frappe/utils/redis_wrapper.py
  2. +4
    -0
      frappe/www/print.py

+ 5
- 5
frappe/utils/redis_wrapper.py Zobrazit soubor

@@ -102,23 +102,23 @@ class RedisWrapper(redis.Redis):
def delete_key(self, *args, **kwargs): def delete_key(self, *args, **kwargs):
self.delete_value(*args, **kwargs) self.delete_value(*args, **kwargs)


def delete_value(self, keys, user=None, make_keys=True):
def delete_value(self, keys, user=None, make_keys=True, shared=False):
"""Delete value, list of values.""" """Delete value, list of values."""
if not isinstance(keys, (list, tuple)): if not isinstance(keys, (list, tuple)):
keys = (keys, ) keys = (keys, )


for key in keys: for key in keys:
if key in frappe.local.cache:
del frappe.local.cache[key]

if make_keys: if make_keys:
key = self.make_key(key)
key = self.make_key(key, shared=shared)


try: try:
self.delete(key) self.delete(key)
except redis.exceptions.ConnectionError: except redis.exceptions.ConnectionError:
pass pass


if key in frappe.local.cache:
del frappe.local.cache[key]

def lpush(self, key, value): def lpush(self, key, value):
super(redis.Redis, self).lpush(self.make_key(key), value) super(redis.Redis, self).lpush(self.make_key(key), value)




+ 4
- 0
frappe/www/print.py Zobrazit soubor

@@ -270,6 +270,10 @@ def make_layout(doc, meta, format_data=None):
doc.set(df.fieldname, True) # show this field doc.set(df.fieldname, True) # show this field


if is_visible(df, doc) and has_value(df, doc): if is_visible(df, doc) and has_value(df, doc):
if page[-1]['columns'] == []:
# if no column, add one
page[-1]['columns'].append({'fields': []})

page[-1]['columns'][-1]['fields'].append(df) page[-1]['columns'][-1]['fields'].append(df)


# section has fields # section has fields


Načítá se…
Zrušit
Uložit