summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavisLWebb <davislwebb@ymail.com>2014-02-17 12:46:57 -0500
committerDavisLWebb <davislwebb@ymail.com>2014-02-17 12:46:57 -0500
commit9b4af7a6342819944ac06d9b5d44789bf5404676 (patch)
tree881a187230eb1dec5dbf8e492f476efc3f371108
parent8e4076db8ad2360f08bf2549450743d7b5da04f3 (diff)
parentabb59d697fb7d7e915b86fff833a0f56bbe141c0 (diff)
Merge https://github.com/LukeShu/leaguer
-rw-r--r--amurrel_id_rsa.pub1
-rw-r--r--docs/DesignDocument-classes.dot74
2 files changed, 38 insertions, 37 deletions
diff --git a/amurrel_id_rsa.pub b/amurrel_id_rsa.pub
new file mode 100644
index 0000000..002cd6d
--- /dev/null
+++ b/amurrel_id_rsa.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDRBeLwgCy9xZKuapdPQZHpJPv1EiM7mXXII5a8Z5VxNePt6Pmer/AKfbK2qLufYDSRXmkd8crGJq7x+6rI84sQUXCTwIKNatzjjRGkEFtEU4crQZIh9ydZGHMJus8wMI2NFA6Q8GheFamEl+nbvtQgHPIFqWKkmQVu7V0mm6khd4vHmHBwUg2/fgmi0/N5Gp4WjAd9q9I5Kn67BmOMBPKHyy3/+qZGaP9jBgTqSgFLJe9Y5EsHF0vWkJQjcNXjEjK611H+0Xgm71eiFevoCpYX4b50mCOC1gQL+rd9aALX7k3H5iK3mzMYODj+Uo/M2VKs8tYh+zb8rUce2fOBIfFV amurrel@purdue.edu
diff --git a/docs/DesignDocument-classes.dot b/docs/DesignDocument-classes.dot
index 3e7a0f5..cccc477 100644
--- a/docs/DesignDocument-classes.dot
+++ b/docs/DesignDocument-classes.dot
@@ -225,41 +225,41 @@ digraph systemModel {
###################################################################
# controller/model relations
###################################################################
- Server -> MainController:edit;
- MainController:update -> Server;
-
- User -> LoginController:login;
-
- Tournament -> SearchController:show_results;
- Match -> SearchController:show_results;
- Team -> SearchController:show_results;
- User -> SearchController:show_results;
-
- Tournament -> TournamentsController:index;
- Tournament -> TournamentsController:show;
- Match -> TournamentsController:show;
- Tournament -> TournamentsController:edit;
- TournamentsController:create -> Tournament;
- TournamentsController:update -> Tournament;
- TournamentsController:end -> Tournament;
-
- Match -> MatchesController:index;
- Match -> MatchesController:show;
- Team -> MatchesController:show;
- User -> MatchesController:show;
- Match -> MatchesController:edit;
- MatchesController:update -> Match;
-
- Team -> TeamsController:index;
- Team -> TeamsController:show;
- User -> TeamsController:show;
- Team -> TeamsController:edit;
- TeamsController:update -> Team;
-
- User -> UsersController:index;
- User -> UsersController:show;
- User -> UsersController:edit;
- UsersController:create -> User;
- UsersController:update -> User;
- UsersController:delete -> User;
+ Server:main -> MainController:edit;
+ MainController:update -> Server:main;
+
+ User:main -> LoginController:login;
+
+ Tournament:main -> SearchController:show_results;
+ Match:main -> SearchController:show_results;
+ Team:main -> SearchController:show_results;
+ User:main -> SearchController:show_results;
+
+ Tournament:main -> TournamentsController:index;
+ Tournament:main -> TournamentsController:show;
+ Match:main -> TournamentsController:show;
+ Tournament:main -> TournamentsController:edit;
+ TournamentsController:create -> Tournament:main;
+ TournamentsController:update -> Tournament:main;
+ TournamentsController:end -> Tournament:main;
+
+ Match:main -> MatchesController:index;
+ Match:main -> MatchesController:show;
+ Team:main -> MatchesController:show;
+ User:main -> MatchesController:show;
+ Match:main -> MatchesController:edit;
+ MatchesController:update -> Match:main;
+
+ Team:main -> TeamsController:index;
+ Team:main -> TeamsController:show;
+ User:main -> TeamsController:show;
+ Team:main -> TeamsController:edit;
+ TeamsController:update -> Team:main;
+
+ User:main -> UsersController:index;
+ User:main -> UsersController:show;
+ User:main -> UsersController:edit;
+ UsersController:create -> User:main;
+ UsersController:update -> User:main;
+ UsersController:delete -> User:main;
}