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.

Sign up for GitHub

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

renamed discipline to topic #985

Merged
merged 1 commit into from
Aug 31, 2015
Merged

renamed discipline to topic #985

merged 1 commit into from
Aug 31, 2015

Conversation

stopfstedt
Copy link
Member

fixes #739

@stopfstedt
Copy link
Member Author

here's what's left:

$ egrep -ir 'discipline' src/
src/Ilios/CoreBundle/Entity/Session.php:     * @ORM\JoinTable(name="session_x_discipline",
src/Ilios/CoreBundle/Entity/Session.php:     *     @ORM\JoinColumn(name="discipline_id", referencedColumnName="discipline_id", onDelete="CASCADE")
src/Ilios/CoreBundle/Entity/Course.php:     * @ORM\JoinTable(name="course_x_discipline",
src/Ilios/CoreBundle/Entity/Course.php:     *     @ORM\JoinColumn(name="discipline_id", referencedColumnName="discipline_id", onDelete="CASCADE")
src/Ilios/CoreBundle/Entity/Topic.php: * @ORM\Table(name="discipline")
src/Ilios/CoreBundle/Entity/Topic.php:     * @ORM\Column(name="discipline_id", type="integer")
src/Ilios/CoreBundle/Entity/ProgramYear.php:     * @ORM\JoinTable(name="program_year_x_discipline",
src/Ilios/CoreBundle/Entity/ProgramYear.php:     *     @ORM\JoinColumn(name="discipline_id", referencedColumnName="discipline_id", onDelete="CASCADE")

@jrjohnson
Copy link
Member

:+1

@stopfstedt stopfstedt assigned dartajax and unassigned jrjohnson Aug 28, 2015
dartajax added a commit that referenced this pull request Aug 31, 2015
@dartajax
Merge pull request #985 from stopfstedt/739_rename_discipline_to_topic
c48756a 
renamed discipline to topic
@dartajax dartajax merged commit c48756a into ilios:master Aug 31, 2015
@stopfstedt stopfstedt deleted the 739_rename_discipline_to_topic branch August 31, 2015 21:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@dartajax dartajax

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Change discipline to topic
3 participants
@stopfstedt @jrjohnson @dartajax