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

Jump to bottom

Minor bug fixes and features adjustments. #154

Merged
merged 4 commits into from May 5, 2016
Merged

Minor bug fixes and features adjustments. #154

merged 4 commits into from May 5, 2016

Conversation

justinmeiners
Copy link
Collaborator

@justinmeiners justinmeiners commented May 5, 2016 •
edited

@k7hpn
Copy link
Member

k7hpn commented May 5, 2016

Hey, one other note as you work on this: I added a CHANGELOG.md document to the root of the project (and I added it to the "Solution Items" folder in Visual Studio but I'm not sure if that change has made it back into MCLD/master) - I'm trying to follow the change log guidance at keepachangelog.com since we're not doing the big-honking-pull-request approach now. Just ensure you add entries for all your adds/changes/removals/fixes/etc. 👍

@justinmeiners
Copy link
Collaborator Author

I will go ahead and do that.

Pre-program registration bug fix, direct URL and badge detail improve…
ab26b43 
…ments (MCLD#152)

- Fix MCLD#149 Guessing the registration URL allows circumventing the log start date bug
- Add direct-link search for Events (by system, branch, or search string)
- Add direct-link search for Challenges (by search string)
- Unify badge detail logic (was in two places)
- When badge details show an event, add a link to search for that event
@justinmeiners
Copy link
Collaborator Author

If my changes look acceptable to you they should be ready to merge. I just went through a test with a fresh installation to ensure the database changes were made appropriately and the reading goal triggers work correctly.

k7hpn
k7hpn reviewed May 5, 2016
View reviewed changes
SRP/Controls/PatronRegistration.ascx
<asp:RegularExpressionValidator runat="server" ControlToValidate="LibraryCard" Display="Dynamic"
ErrorMessage="Library card number is invalid."
SetFocusOnError="True"
ValidationExpression="^((21391|23005)(\d{9}))($|\s*)">invalid</asp:RegularExpressionValidator>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I think you need to pull this block out. 😄

@k7hpn
Copy link
Member

k7hpn commented May 5, 2016

This looks pretty good! Let me know when you address those two notes and we'll :shipit:

Minor changes and bug fixes.
7365e8c 
- Fixed MCLD#153, "Award Name" should say "Avatar Name"
- Fixed MCLD#151, "Reading goal should only use points earned by reading"
- Fixed MCLD#52, Program flag "Allow Patron to enter book review" now provides field.
@justinmeiners
Copy link
Collaborator Author

I must have made a mistake in my branch merging because I specifically checked that! Thank you for the catch. The commit is now updated.

@k7hpn k7hpn merged commit 512183c into MCLD:master May 5, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@justinmeiners justinmeiners

Labels
bug enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@justinmeiners @k7hpn