Commit 9acab10c authored by Ivan Tyagov's avatar Ivan Tyagov

Fix create analysis

See merge request nexedi/wendelin!51
parents 117b9ef3 6a506747
...@@ -43,10 +43,13 @@ for movement in portal_catalog(query = query): ...@@ -43,10 +43,13 @@ for movement in portal_catalog(query = query):
if line.getResourceValue() == movement.getResourceValue() and line.getQuantity() < 0: if line.getResourceValue() == movement.getResourceValue() and line.getQuantity() < 0:
transformation_list.append(transformation) transformation_list.append(transformation)
break break
transformation_list += list(portal.portal_catalog( for transformation in portal.portal_catalog(
portal_type = "Data Transformation", portal_type = "Data Transformation",
validation_state = "validated", validation_state = "validated",
resource_relative_url = movement.getResource())) resource_relative_url = movement.getResource()):
if transformation.getVariationCategoryList() == movement.getVariationCategoryList():
transformation_list.append(transformation)
for transformation in transformation_list: for transformation in transformation_list:
is_shared_data_analysis = False is_shared_data_analysis = False
# Check if analysis already exists # Check if analysis already exists
......
...@@ -71,9 +71,12 @@ allow_type(pd.Timestamp) ...@@ -71,9 +71,12 @@ allow_type(pd.Timestamp)
allow_type(pd.DatetimeIndex) allow_type(pd.DatetimeIndex)
# XXX: pd.DataFRame has its own security thus disable until we can fully integrate it # XXX: pd.DataFRame has its own security thus disable until we can fully integrate it
#allow_type(pd.DataFrame) #allow_type(pd.DataFrame)
allow_type(pd.MultiIndex)
allow_type(pd.Index)
allow_type(pd.core.groupby.DataFrameGroupBy) allow_type(pd.core.groupby.DataFrameGroupBy)
allow_class(pd.DataFrame) allow_class(pd.DataFrame)
# Modify 'safetype' dict in full_write_guard function # Modify 'safetype' dict in full_write_guard function
# of RestrictedPython (closure) directly To allow # of RestrictedPython (closure) directly To allow
# write access to ndarray, DataFrame, ZBigArray and RAMArray objects # write access to ndarray, DataFrame, ZBigArray and RAMArray objects
...@@ -84,10 +87,11 @@ full_write_guard.func_closure[1].cell_contents.__self__[np.core.records.record] ...@@ -84,10 +87,11 @@ full_write_guard.func_closure[1].cell_contents.__self__[np.core.records.record]
full_write_guard.func_closure[1].cell_contents.__self__[pd.DataFrame] = True full_write_guard.func_closure[1].cell_contents.__self__[pd.DataFrame] = True
full_write_guard.func_closure[1].cell_contents.__self__[pd.tseries.index.DatetimeIndex] = True full_write_guard.func_closure[1].cell_contents.__self__[pd.tseries.index.DatetimeIndex] = True
full_write_guard.func_closure[1].cell_contents.__self__[pd.core.indexing._iLocIndexer] = True full_write_guard.func_closure[1].cell_contents.__self__[pd.core.indexing._iLocIndexer] = True
full_write_guard.func_closure[1].cell_contents.__self__[pd.MultiIndex] = True
full_write_guard.func_closure[1].cell_contents.__self__[pd.Index] = True
from wendelin.bigarray.array_zodb import ZBigArray from wendelin.bigarray.array_zodb import ZBigArray
full_write_guard.func_closure[1].cell_contents.__self__[ZBigArray] = True full_write_guard.func_closure[1].cell_contents.__self__[ZBigArray] = True
allow_type(ZBigArray) allow_type(ZBigArray)
from wendelin.bigarray.array_ram import RAMArray from wendelin.bigarray.array_ram import RAMArray
full_write_guard.func_closure[1].cell_contents.__self__[RAMArray] = True full_write_guard.func_closure[1].cell_contents.__self__[RAMArray] = True
allow_type(RAMArray) allow_type(RAMArray)
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment