Skip to content

Conversation

@swift2512
Copy link

Asset ID, Asset Tag and Serial number are already defined in 'app/View/Label.php' so users should be able to select it for their QR codes. Generated barcodes scan as intended.
image

app/View/Label.php
image

Asset ID, Asset Tag and Serial number are already defined in 'app/View/Label.php' so users should be able to select it for their QR codes.
@swift2512 swift2512 requested a review from snipe as a code owner September 17, 2025 11:18
@snipe
Copy link
Member

snipe commented Sep 17, 2025

Hi - can you rebase this? I see a ton of commits in here that are mine, not yours, which makes it really hard to see what you actually did.

@swift2512 swift2512 changed the base branch from develop to master September 17, 2025 11:23
@snipe
Copy link
Member

snipe commented Sep 17, 2025

Hi again - PRs should always be put up against the develop branch, not master, per the dev documentation.

@swift2512
Copy link
Author

Hi - can you rebase this? I see a ton of commits in here that are mine, not yours, which makes it really hard to see what you actually did.

I am really bad with GIT. Basically, I have no clue when it comes to pull requests. 🤣

@uberbrady
Copy link
Member

uberbrady commented Sep 17, 2025

I get it - and git is a very powerful tool, but also, very very unintuitive, so it can be a real beast.

There are two ways we can go on this - on the first hand, we can try to walk you through how to do this on your own, via git. Or, on the other hand, we can just do it for you. Since you've been a power-user for a while, and might want to make more contributions in the future, Option 1 is probably the best choice for the long-term. But I would totally understand option two.

If you did want to try and do this yourself, this is what you'd do.

  1. Fork our repo onto your own personal namespace. It looks like you've already done this, either on purpose or inadvertently - but here it is: https://github.com/swift2512/snipe-it
  2. Get your branch caught up to date by clicking the 'Sync fork' button on Github.
  3. Follow the instructions from the green 'code' button to get that repo onto your computer
  4. try git checkout patch-4 to make sure you have your patch. Also do a git pull
  5. Switch to develop (git checkout develop). Do a git pull to make sure you're brought up to date with the latest.
  6. Create a new branch from develop to put your changes onto - git checkout -b patch-4-cleaned (or something like that).
  7. Now, what we want to do is cherry-pick the changes you've made, onto this branch. git cherry-pick e07572684a28fedb10fcc00aaf59acd4266864f3..c443acc6c5870357dc9c509d230daf93781d92af (those are the two commit-hashes for your two changes).
  8. git commit
  9. git push or maybe git push -u origin patch-4-cleaned (or whatever you named your branch).
  10. Go back to the Github interface on the Snipe-IT repo and create your PR from there. Make sure to pick 'develop' as your source branch.

Honestly, just writing up the instructions was pretty horrible! I do hate that this tooling can be so genuinely unpleasant to use sometimes - but I guess that's just life :/

And it really would be no bother if you want to just ask us to do it - I just wanted to make sure you could start to learn some of this stuff if you were interested.

GitHub
A free open source IT asset/license management system - swift2512/snipe-it

@swift2512 swift2512 closed this Oct 9, 2025
@swift2512 swift2512 deleted the patch-4 branch October 9, 2025 12:39
@swift2512
Copy link
Author

@uberbrady I've tried and failed miserably 😅 Commit got lost somewhere without branch. Created a new pull request. Could you point it to the right direction? I really love that QR codes point to Asset ID name - makes my barcode scanner useful.
#18020

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants