Skip to content

Conversation

@adku
Copy link
Contributor

@adku adku commented Aug 26, 2019

Done: #12

@watkyn watkyn linked an issue Feb 12, 2020 that may be closed by this pull request
@macblazer
Copy link
Contributor

@adku Do you want to resolve the conflicts on this PR? The storyboard conflict is probably simpler to just delete your changes, and recreate the changes from the master branch storyboard.

Otherwise, I can take your code changes into a branch of my own and reapply the storyboard changes.

@adku
Copy link
Contributor Author

adku commented May 6, 2020

@macblazer
Resolved conflicts and adjusted storyboard

}
}

func updateSiteUI() {
Copy link
Contributor

Choose a reason for hiding this comment

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

Since this project makes heavy use of bindings, if you wanted to you could remove this hide/show logic from the code and use bindings on the labels' Hidden property, and tie it to the Site checkbox state.

Copy link
Contributor

@macblazer macblazer left a comment

Choose a reason for hiding this comment

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

The code seems to work as is. One minor adjustment perhaps.

@macblazer macblazer merged commit bcffa0c into jamf:master May 11, 2020
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.

Feature Request - Sites

3 participants