Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Register
  • Sign in
  • erp5 erp5
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
  • Merge requests 142
    • Merge requests 142
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Jobs
  • Commits
Collapse sidebar
  • nexedinexedi
  • erp5erp5
  • Merge requests
  • !734

History Diff: Use of property as well as attributes to display diff

  • Review changes

  • Download
  • Patches
  • Plain diff
Closed Ayush Tiwari requested to merge tiwariayush/erp5:history_diff into master Aug 31, 2018
  • Overview 1
  • Commits 10
  • Pipelines 0
  • Changes 27

We use Report Section to display diff for properties as well as attribute dict. This will ensure that we have old_value, new_value and current_value for properties which are of type int/string/float and at the same time being able to use DiffTool to display diff for large text contents and provide link to the current_value.

Also, we simplify the way the current diff is being displayed in History Tab and let DiffTool calculate diff and then play with UI to display it as required.

Other extra changes include:

  • Remove redundant diff(ex: useless data, base_data and text_content redundancy)
  • Provide link for large content instead of displaying the data which is almost impossible to understand on the view.
  • Use DiffTool to handle the binary problem and display error, hence generalizing the case where diff is not calculated properly.

View of History in New UI:

Screenshot_2018-09-04_at_3.04.26_PM

View of History in Old UI:

Screenshot_2018-09-04_at_4.59.39_PM

Problems remaining:

  • report_view as page template doesn't support rendering of gadget.
  • Current Value Link is not working for new UI as there is no way to show the value through URL as we do in XHTML UI (ex: document_relative_url/getTextContent)
  • Remove showing redundant properties as data and text_content
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: history_diff
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7