Skip to content

Commit c196519

Browse files
author
Theresa
committed
fix exercise administration
1 parent 86d9004 commit c196519

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

app/views/exercises/exercises_all.html.erb

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,12 @@
1515
<% @exercises.each do |exercise| %>
1616
<tr>
1717
<td><%= link_to exercise.title, exercise %></td>
18-
<% if defined? exercise.user %>
19-
<% if exercise.user.first_name.nil?%>
20-
<td><%= link_to "User#{exercise.user.id}", user_path(exercise.user)%></td>
21-
<% else %>
22-
<td><%= link_to exercise.user.name, user_path(exercise.user) %></td>
23-
<% end %>
24-
<% else %>
18+
<% if !exercise.user %>
2519
<%= 'User undefined' %>
20+
<% elsif exercise.user.first_name.nil?%>
21+
<td><%= link_to "User#{exercise.user.id}", user_path(exercise.user)%></td>
22+
<% else %>
23+
<td><%= link_to exercise.user.name, user_path(exercise.user) %></td>
2624
<% end %>
2725
<td><%= exercise.created_at %> </td>
2826
<td><%= exercise.public ? 'public' : 'private' %> </td>

config/routes.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
get 'sessions/destroy'
1616

1717
get 'comments/comments_all'
18+
get 'exercises/exercises_all'
1819

1920
get 'exercises/:id/duplicate', to: 'exercises#duplicate', as: 'duplicate_exercise'
2021

@@ -35,8 +36,6 @@
3536
end
3637
end
3738

38-
get 'exercises/exercises_all'
39-
4039

4140

4241

db/schema.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
t.integer "exercise_id"
111111
t.datetime "created_at", null: false
112112
t.datetime "updated_at", null: false
113+
t.string "file_name"
113114
end
114115

115116
add_index "exercise_files", ["exercise_id"], name: "index_exercise_files_on_exercise_id"

0 commit comments

Comments
 (0)