Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

luci-app-nut: fix wrong nut_server option #7542

Closed

Conversation

VergilGao
Copy link

@VergilGao VergilGao commented Jan 9, 2025

There is no driver_path prefix in the original lua code.

o = s:option(ListValue, "driver", translate("Driver"))
for driver in driverlist do
o:value(driver)
end

and currently the uci configuration file does not require this path prefix by default.

  • This PR is not from my main or master branch 💩, but a separate branch ✅
  • Each commit has a valid ✒️ Signed-off-by: <[email protected]> row (via git commit --signoff)
  • Each commit and PR title has a valid 📝 <package name>: title first line subject for packages
  • Incremented 🆙 any PKG_VERSION in the Makefile
  • Tested on: (x86/64, 24.10.0-rc4, Edge) ✅
  • ( Preferred ) Mention: @systemcrash the original code author for feedback
  • ( Preferred ) Screenshot or mp4 of changes:
  • ( Optional ) Closes: openwrt/packages#25552
  • ( Optional ) Depends on: e.g. openwrt/packages#pr-number in sister repo
  • Description: (describe the changes proposed in this PR)

@VergilGao VergilGao force-pushed the fix-nut_server-wrong-option branch 4 times, most recently from bf2b100 to c420987 Compare January 9, 2025 06:01
@systemcrash
Copy link
Contributor

Your fix is correct. But please keep the same amount of line numbers so an i18n refresh is not required.

There is no driver_path prefix in the original lua code.

https://github.com/openwrt/luci/blob/f6e6b055d514595941db4a4cc11c3d9902eabefb/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua#L132-L135

Currently the uci configuration file does not require this path prefix by default.

Signed-off-by: Tianshuai Gao <[email protected]>
@VergilGao VergilGao force-pushed the fix-nut_server-wrong-option branch from c420987 to 00ee511 Compare January 9, 2025 13:13
@VergilGao
Copy link
Author

Your fix is correct. But please keep the same amount of line numbers so an i18n refresh is not required.

ok.

@systemcrash
Copy link
Contributor

Please rebase on current master and force push

@systemcrash
Copy link
Contributor

Please also fix your Author line (email in github - set it to the same as your SOB). This won't be accepted:
author:"羽先生 <[email protected]>"

@VergilGao
Copy link
Author

Please also fix your Author line (email in github - set it to the same as your SOB). This won't be accepted:
author:"羽先生 <[email protected]>"

OK,i will do it tomorrow since its late night for me.

@systemcrash
Copy link
Contributor

Should be OK. Today would have been better since we're approaching 24 release.

@VergilGao VergilGao deleted the fix-nut_server-wrong-option branch January 10, 2025 01:24
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.

2 participants