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

Allow instructors to also be CAs #2084

Merged
merged 1 commit into from
Feb 12, 2024
Merged

Allow instructors to also be CAs #2084

merged 1 commit into from
Feb 12, 2024

Conversation

damianhxy
Copy link
Member

@damianhxy damianhxy commented Feb 11, 2024

Description

Re-allow instructors to be CAs.

Motivation and Context

#2065 prevented instructors from also being CAs. However, this caused problems in parts of the code that set users to be both. Furthermore, it might be desirable to allow instructors to also be CAs since only CAs have sections.

This PR re-allows instructors to be CAs, but improves upon #1420 by disabling the instructor & ca fields when the dropped checkbox is clicked.

How Has This Been Tested?

Edit a user, and check that dropped checkbox disables instructor / ca checkboxes and vice versa.

dropped selected
Screenshot 2024-02-11 at 15 01 17

instructor / ca selected
Screenshot 2024-02-11 at 15 01 28

none selected
Screenshot 2024-02-11 at 15 01 36

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • I have run rubocop and erblint for style check. If you haven't, run overcommit --install && overcommit --sign to use pre-commit hook for linting
  • My change requires a change to the documentation, which is located at Autolab Docs
  • I have updated the documentation accordingly, included in this PR

@damianhxy damianhxy requested a review from jlge February 11, 2024 20:00
Copy link
Contributor

coderabbitai bot commented Feb 11, 2024

Walkthrough

Walkthrough

The recent updates focus on refining the user role management within a course platform, specifically targeting the logic surrounding the handling of user roles, such as instructors and course assistants. The primary aim was to streamline the process of enabling or disabling fields based on user roles and to enforce a rule preventing instructors or course assistants from being marked as dropped. This was achieved through a combination of JavaScript and Ruby on Rails model adjustments.

Changes

File Path Change Summary
.../javascripts/course_user_data_edit.js Refactored to enhance user role handling logic, introducing disable_fields and instructor_or_ca_not_dropped functions for better field management and mutual exclusion logic.
app/models/course_user_datum.rb Modified the instructor_or_ca_or_dropped validation to instructor_or_ca_not_dropped, enforcing a rule that disallows marking instructors or course assistants as dropped.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit-tests for this file.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit tests for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository from git and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit tests.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • The JSON schema for the configuration file is available here.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

@gitstream-cm gitstream-cm bot added the small Pull request is small label Feb 11, 2024
Copy link
Contributor

@jlge jlge left a comment

Choose a reason for hiding this comment

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

LGTM ✔️

@jlge jlge added this pull request to the merge queue Feb 12, 2024
Merged via the queue into master with commit 4553014 Feb 12, 2024
12 checks passed
@jlge jlge deleted the allow-instructor-ca branch February 12, 2024 01:12
KesterTan pushed a commit that referenced this pull request Feb 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
small Pull request is small
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants