1. 16 Aug, 2018 6 commits
  2. 15 Aug, 2018 1 commit
  3. 14 Aug, 2018 3 commits
  4. 13 Aug, 2018 1 commit
  5. 10 Aug, 2018 5 commits
  6. 09 Aug, 2018 3 commits
  7. 08 Aug, 2018 5 commits
  8. 07 Aug, 2018 2 commits
  9. 06 Aug, 2018 1 commit
  10. 03 Aug, 2018 6 commits
  11. 02 Aug, 2018 1 commit
  12. 01 Aug, 2018 2 commits
  13. 31 Jul, 2018 4 commits
    • Ayush Tiwari's avatar
      ERP5 Diff Tool · 6ef81933
      Ayush Tiwari authored
      ERP5 Diff Tool is used to get beautified diff between any 2 ERP5 objects as well as different revisions of a single ERP5 object **(both in XHTML as well as renderJS UI)**
      
      This would be helpful in:
      --------------------------------
      - ZODB History Tab to check the edit workflow history.
      - Revision of the ERP5 object, for example: web pages, documents, etc
      - Business Template installation
      
      Diff Tool will also make it able to patch one ERP5 object from the diff *(for version 1, we only patch objects which are of same portal type)*. The current version of Diff Tool uses `deepdiff` python library which provides us with patch which can complies(not completely) with CRDT datatype, thanks to which patch application can be less painful.
      
      Diff Tool is able to differentiate between the diff according to type of user, for example, we do not want a normal user to be looking at diff of some internal properties of object(for ex: workflows), but for a developer user, we are fine with it.
      
      How we calculate the Diff of any two objects:
      -----------------------------------------------------------
      1. Convert the objects to their JSON format.
      2. Use `deepdiff` to find out the diff for the 2 JSON objects.
      3. Return a beautified JSON Diff
      
      ### NOTE:  This MR succeeds the MR related to create correct URL for History tabs: !695 !683
      
      TODO:
      --------
      - [x] Add tests for beautified diff and patch.
      - [x] Diff tool should be working in new UI.
      - [x] Fix the pagination.
      
      Example Diff Tool in both UIs:
      --------------------------------------
      ![XHTML UI Diff](/uploads/846b6b7806939a64922e364d309c028c/Screenshot_2018-07-04_at_6.07.46_PM.png)
      
      ![renderJS UI Diff](/uploads/ae7021fbf9cf9f952a7d2d4044df8a78/Screenshot_2018-07-05_at_10.34.01_AM.png)
      
      /reviewed-on nexedi/erp5!686
      6ef81933
    • Ayush Tiwari's avatar
      a8eb8620
    • Ayush Tiwari's avatar
    • Ayush Tiwari's avatar