- 15 Feb, 2017 34 commits
-
-
Ayush Tiwari authored
-
Ayush Tiwari authored
One of the difference between SQL and ERP5 Catalog is how they handle their properties. For ERP5Catalog, we use property_sheets which generate setters and getters, for SQLCatalog, properties just act as attributes(as one can expect from a property set on a class). This creates a difference on how we use them, especially for list_type properties, which have accessors like get<PropertyName>List to get the list of objects. For SQLCatalog, there is no such thing. This creates problem whereever 'get<PropertyName>' or getProperty(<name>) was being used to get multiple property types. So, we changed this to rely on getattr for the Python Scripts in this commit. Note that, getattr isn't good if we care about performance, but given that its used only twice, this can be better than adding extra function overhead.
-
Ayush Tiwari authored
-
Ayush Tiwari authored
-
Ayush Tiwari authored
-
Ayush Tiwari authored
-
Ayush Tiwari authored
Also, add test for migration in testERP5Catalog(as the first test to be run) and migrate Catalog in afterSetup in testERP5CatalogSecurityUidOptimization.
-
Ayush Tiwari authored
-
Ayush Tiwari authored
-
Ayush Tiwari authored
-
Ayush Tiwari authored
Also, Update BusinessTemplate installation with updated filter_dict This removes the need to copy-patch or if-else on meta_type of catalog. Use dynamic migration while installing the catalog method objects for bt5. Note : here we use conversion method for python script but dynamic migration for ZSQL Methods. This is necessary because after the conversion to erp5 object, we need to compile the body to generate code object for python script. By just changing the class, this was not possible. erp5_catalog: Simplify bt5 installation
-
Ayush Tiwari authored
Contains views, property sheets, portal types concerning migration of portal_catalog, sql catalog and their subobjects to erp5 object. Portal Types: 1. Catalog : ERP5 Catalog object (an ERP5 Folder), which earlier used to be OFS Folder. Actions: Update Catalog Clear Catalog Clear Reserved Export Properties 2. Catalog Tool: Portal Catalog where we can add and use multiple ERP5 catalogs. Actions: Hot ReindexAll 3. SQL Method: SQL methods with their views inside erp5. Actions: Run Method Property Sheet: 1. Catalog 2. CatalogTool 3. SQLMethod Containing properties for the various portal_types/classes respectively. 4. CatalogFilter Also, filter_dict for erp5_catalog would now not be a Persistent Mapping object. The info inside filter_dict is being saved inside the SQL Method objects as their properties. Views: 1. Catalog (View) 2. CatalogTool(View, Properties, Filtered Items), Object Actions 3. SQLMethod (View, Filter) 4. Python Script (Filter) Extras: - Dialog view for catalog before clear_catalog - Add typeBaseMethod(s) for PythonScript and SQLMethod portal types: The methods <portal_type>_getRedirectParameterDictAfterAdd are required for these portal_types, cause their __call__ methods are overridden, so after addition of new objects for them, it was taking to the url concerning wherever __call__ methods directed them. Now, we change them to redirect to 'abosulte_url+'/view'' which is basically the homepage for these catalog methods. - Do not use default ERP5 Catalog to show properties: Earlier, in tales for properties for any erp5 catalog, we showed the values for the default_erp5_catalog. But keeping in mind that we can have multiple catalogs at same time, the old approach was wrong. Hence, we now display properties for the current catalog - Search fo Catalog_viewContentList and Catalog_viewFilterList
-
Ayush Tiwari authored
Its better to change the tests where they need to call getpath function of portal_catalog to use portal_catalog.getpath instead of portal_catalog.getPath, as we have overridden the 'getPath' function for CatalogTool class due to change in inherited class.
-
Ayush Tiwari authored
- This step is needed due to the use of BaseTool as Base class for CatalogTool due to which there were conflict between reindexObject from the Base and the one from the BaseTool.
-
Ayush Tiwari authored
- Remove copy-pasting all code from CatalogTool, better to rely on inheritence - Remove unnecessary imports - Add argument id in __init__ class - Add functions _isBootstrapRequired and _bootstrap - Update BusinessTemplate installation according to changes made in ERP5Catalog and Tool
-
Ayush Tiwari authored
We try to move from using SQLCatalog to ERP5Catalog as the default Catalog inside ERP5. The major difference is use of Folder class as the base for Catalog from Products.ERP5Type.Core Significant changes: -Add dtml form for creating ERP5Catalog object -Inherit from Catalog class from Products.ZSQLCatalog.SQLCatalog instead of copy-pasting the whole code again. -Add allowed_types for ERP5Catalog tool -Monkey patch some property setters and getters to maintain consistency -Update id and title for ERP5Catlog while class initialization -Set declarative securities and solve some inheritance conflicts -Add isRADContent for ERP5Catalog Class -Solve inheritence conflict for _setPropValue function in ERP5Catalog class -Add SQL Method portal_type in allowed_types for ERP5Catalog class -Override getCatalogMethodIds cause it uses global variable in SQLCatalog.Catalog -Redefine security declarations -Add functions for object_actions of Catalog portal_type in ERP5Catalog object -Add filter_dict and _properties attributes for compatibilty -isIndexable should be function instead of Accessor property for Catalog object
-
Ayush Tiwari authored
Here, we are creating the SQLMethod class based on ZSQLMethods.SQL class and XMLObject. Also, we are moving important attributes to property in 'SQL Method' property sheets.
-
Ayush Tiwari authored
Loosen the security on methods which we will use in erp5 catalog view in restricted environment. As suggested by \@vpelletier, this should be accepted as all methods were restricted by default earlier.
-
Cédric Le Ninivin authored
-
Cédric Le Ninivin authored
erp5_travel_expense: Record creation is eventless erp5_travel_expense: Representative Record creation is done by an alarm
-
Cédric Le Ninivin authored
-
Cédric Le Ninivin authored
-
Cédric Le Ninivin authored
-
Cédric Le Ninivin authored
-
Xiaowu Zhang authored
-
Xiaowu Zhang authored
-
Xiaowu Zhang authored
-
Xiaowu Zhang authored
-
Xiaowu Zhang authored
-
Xiaowu Zhang authored
-
Xiaowu Zhang authored
-
Xiaowu Zhang authored
-
Xiaowu Zhang authored
-
Iliya Manolov authored
Copypasta from the other MR [here](nexedi/erp5!230 (comment 22890)). I found a problem and tried again from scratch. I will close that Merge Request once this one has been approved... @Tyagov Currently, when running a Jupyter notebook using some types of imports leads to errors. With this fix the following ways to import things are working: ```python import string # worked before fix import string as s # worked before fix from string import ascii_lowercase # worked before fix from string import ascii_lowercase, ascii_uppercase, digits # fixed - used to import only the first thing from string import ascii_lowercase as a, ascii_uppercase as b # fixed - used to give "Error at Server Side" from string import * # fixed - used to give "Error at Server Side" from string import Template # works ``` This was happening because after executing every cell the code would move between SlapOS nodes and lose the imported modules/classes/stuff. This was partially fixed before, but this fix should cover all use cases. I have also added tests for these cases in testExecuteJupyter... /reviewed-on nexedi/erp5!233
-
- 10 Feb, 2017 1 commit
-
-
Nicolas Wavrant authored
Otherwise, the portal_status_message is not correctly escaped, which can cause bugs with older web browsers. It happens when the translation of this messages in the user's language uses special characters
-
- 06 Feb, 2017 2 commits
-
-
Kazuhiko Shiozaki authored
MonthlyRangeMovementGroup: make tested property list configurable, whose default is ('start_date', 'stop_date').
-
Kazuhiko Shiozaki authored
-
- 03 Feb, 2017 1 commit
-
-
Kazuhiko Shiozaki authored
-
- 02 Feb, 2017 2 commits
-
-
Gabriel Monnerat authored
Fix inconsistencies from gadgets /cc @jerome /reviewed-on !225
-
Gabriel Monnerat authored
erp5_knowledge_pad: Fix inconsistency with preferred_height and preferred_width in google_maps gadget ERP5Type.ConsistencyMessage for PropertyTypeValidity type_check on portal_gadgets/google_maps (message: Attribute preferred_width should be of type string but is of type <type 'int'>) ERP5Type.ConsistencyMessage for PropertyTypeValidity type_check on portal_gadgets/google_maps (message: Attribute preferred_height should be of type string but is of type <type 'int'>)
-