ereuse/devicehub-django
8
0
Fork 0
Code Issues 5 Pull requests 10 Packages Projects Releases Wiki Activity

admin lot tags #47

Open
cayop wants to merge 4 commits from lots-tags into main
pull from: lots-tags
merge into: ereuse:main
Conversation 1 Commits 4 Files changed 15 +301 -65
cayop commented 2025-02-03 12:38:53 +00:00
Owner
Copy link

ereuse/projectes#148

https://farga.pangea.org/ereuse/projectes/issues/148
cayop added 1 commit 2025-02-03 12:38:54 +00:00
cayop requested review from pedro 2025-02-03 12:39:03 +00:00
cayop added 3 commits 2025-02-04 15:06:46 +00:00
pedro added the
Priority
Medium
 label 2025-02-10 12:09:40 +00:00
pedro commented 2025-02-11 11:04:47 +00:00
Owner
Copy link

On general meeting 2025-02-11 we consensuate the following easy-changes before merging this branch:

  • Change order and sense inside Evidences menu:
    • Upload with Web Form
    • Upload with Spreadsheet
    • Upload with JSON file
  • Allow edit name in admin lot tags for "Unassigned devices" (other people would like to use just one lot "Main", or "Inventory", or "Inbox")
  • Add/recover "Device", menu
  • Add view "Device / All", which shows all devices in a hardcoded way. Future work: The way search work is saving a specific search: ereuse/projectes#165
On general meeting 2025-02-11 we consensuate the following easy-changes before merging this branch: - [ ] Change order and sense inside Evidences menu: - [ ] Upload with Web Form - [ ] Upload with Spreadsheet - [ ] Upload with JSON file - [ ] Allow edit name in admin lot tags for "Unassigned devices" (other people would like to use just one lot "Main", or "Inventory", or "Inbox") - [ ] Add/recover "Device", menu - [ ] Add view "Device / All", which shows all devices in a hardcoded way. Future work: The way search work is saving a specific search: https://farga.pangea.org/ereuse/projectes/issues/165
This pull request has changes conflicting with the target branch.
  • admin/urls.py
  • admin/views.py
  • dashboard/templates/base.html
  • device/templates/new_annotation.html
  • device/views.py
  • lot/templates/new_annotation.html
  • lot/urls.py
  • lot/views.py
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin lots-tags:lots-tags
git checkout lots-tags

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff lots-tags
git checkout main
git merge --ff-only lots-tags
git checkout lots-tags
git rebase main
git checkout main
git merge --no-ff lots-tags
git checkout main
git merge --squash lots-tags
git checkout main
git merge --ff-only lots-tags
git checkout main
git merge lots-tags
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
pedro
Labels
Clear labels   
Compat/Breaking

Breaking change that won't be backward compatible

  
Kind/Bug

Something is not working

  
Kind/Documentation

Documentation changes

  
Kind/Enhancement

Improve existing functionality

  
Kind/Feature

New functionality

  
Kind/Security

This is security issue

  
Kind/Testing

Issue or pull request related to testing

  
Priority
Critical
The priority is critical

  
Priority
High
The priority is high

  
Priority
Low
The priority is low

  
Priority
Medium
The priority is medium

  
Reviewed
Confirmed
Issue has been confirmed

  
Reviewed
Duplicate
This issue or pull request already exists

  
Reviewed
Invalid
Invalid issue

  
Reviewed
Won't Fix
This issue won't be fixed

  
Status
Abandoned
Somebody has started to work on this but abandoned work

  
Status
Blocked
Something is blocking this issue or pull request

  
Status
Need More Info
Feedback is required to reproduce issue or to continue work

  
Test Deployed

this PR is deployed in a domain, so you can see

No labels
Compat/Breaking
Kind/Bug
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Security
Kind/Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
Test Deployed
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: ereuse/devicehub-django#47
No description provided.
Delete branch "lots-tags"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?