Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
erp5
erp5
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Merge Requests 109
    • Merge Requests 109
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Jobs
  • Commits
  • nexedi
  • erp5erp5
  • Merge Requests
  • !465

Merged
Opened Oct 24, 2017 by Nicolas Wavrant@Nicolas
  • Report abuse
Report abuse

Add the business_application base category on all modules for which it is missing

Modules should have the business_application base category set in order to classify them. Normally, the code helper set this category on module creation (https://lab.nexedi.com/nexedi/erp5/blob/master/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_createModule.py#L15), but it is often forgotten to commit it (as it should be defined explicitely in template_portal_type_base_category_list's bt5 property.

This commit tries to fix it globally in all bt5s, using a script : https://lab.nexedi.com/snippets/259. I have tried to respect file modes, file encoding, alphabetical ordering, and "\No newline at end of file" issue in order to not generate useless diffs when other people will commit on these files later.

@jerome , @vpelletier , @kazuhiko , @seb : could you have a check to the file formats to tell me if anything is wrong ?

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://lab.nexedi.com/Nicolas/erp5.git business-application-on-all-module
git checkout -b Nicolas/erp5-business-application-on-all-module FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/master
git merge --no-ff Nicolas/erp5-business-application-on-all-module

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 9
  • Commits 1
  • Changes 60
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: nexedi/erp5!465

Cherry-pick this commit

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备14008524号