Download as
Browse Code »

Commit 2f4de8aa8e8844a01d8a6e5e5e51e9af4bb4fd54

Authored by Vinicius Vieira
Committed by Rafael Manzo
1 parent 13cbdd9c
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

some changes in nested resources routes

Showing 11 changed files with 61 additions and 41 deletions   Show diff stats
app/controllers/projects_controller.rb
  Diff comments   View file @2f4de8a
... ... @@ -35,7 +35,6 @@ class ProjectsController < ApplicationController
35 35 # GET /project/1.json
36 36 def show
37 37 @project_repositories = Repository.repositories_of(params[:id])
38   - @project = Project.find(params[:id])
39 38 set_project
40 39 end
41 40  
... ...
app/controllers/projects_controller.rb~
  Diff comments   View file @2f4de8a
... ... @@ -31,7 +31,7 @@ class ProjectsController < ApplicationController
31 31 # GET /project/1.json
32 32 def show
33 33 @project_repositories = Repository.repositories_of(params[:id])
34   - @project_id = (params[:id])
  34 + @project = Project.find(params[:id])
35 35 set_project
36 36 end
37 37  
... ...
app/controllers/repositories_controller.rb
  Diff comments   View file @2f4de8a
... ... @@ -11,32 +11,36 @@ class RepositoriesController < ApplicationController
11 11 # GET /repositories/1
12 12 # GET /repositories/1.json
13 13 def show
  14 + @project = Project.find(params[:project_id])
14 15 end
15 16  
16   - # GET /repositories/new
  17 + # GET projects/1/repositories/new
17 18 def new
18   - @repository = Repository.new
19 19 @project = Project.find(params[:project_id])
  20 + @repository = Repository.new
20 21 end
21 22  
22 23 # GET /repositories/1/edit
23 24 def edit
  25 + @project = Project.find(params[:project_id])
24 26 end
25 27  
26 28 # POST /repositories
27 29 # POST /repositories.json
28 30 def create
29   - @repository = Repository.new(repository_params)
  31 + @project = Project.find(params[:project_id])
  32 + @repository = @project.repositories.create(params[:repository].permit(:name, :type, :address, :configuration_id))
  33 + redirect_to @project
30 34  
31   - respond_to do |format|
32   - if @repository.save
33   - format.html { redirect_to @repository, notice: 'Repository was successfully created.' }
34   - format.json { render action: 'show', status: :created, location: @repository }
35   - else
36   - format.html { render action: 'new' }
37   - format.json { render json: @repository.errors, status: :unprocessable_entity }
38   - end
39   - end
  35 + #respond_to do |format|
  36 + # if @repository.save
  37 + # format.html { redirect_to @repository, notice: 'Repository was successfully created.' }
  38 + # format.json { render action: 'show', status: :created, location: @repository }
  39 + #else
  40 + # format.html { render action: 'new' }
  41 + #format.json { render json: @repository.errors, status: :unprocessable_entity }
  42 + #end
  43 + #end
40 44 end
41 45  
42 46 # PATCH/PUT /repositories/1
... ...
app/controllers/repositories_controller.rb~
  Diff comments   View file @2f4de8a
... ... @@ -5,18 +5,20 @@ class RepositoriesController < ApplicationController
5 5 # GET /repositories.json
6 6 def index
7 7 @project = Project.find(params[:project_id])
  8 + set_repository
8 9 @repositories = Repository.repositories_of(params[:project_id])
9 10 end
10 11  
11 12 # GET /repositories/1
12 13 # GET /repositories/1.json
13 14 def show
  15 + @project = Project.find(params[:project_id])
14 16 end
15 17  
16   - # GET /repositories/new
  18 + # GET projects/1/repositories/new
17 19 def new
  20 + @project = Project.find(params[:project_id])
18 21 @repository = Repository.new
19   - @project = Project.find(params[:id])
20 22 end
21 23  
22 24 # GET /repositories/1/edit
... ... @@ -26,17 +28,19 @@ class RepositoriesController < ApplicationController
26 28 # POST /repositories
27 29 # POST /repositories.json
28 30 def create
29   - @repository = Repository.new(repository_params)
  31 + @project = Project.find(params[:project_id])
  32 + @repository = @project.repositories.create(params[:repository].permit(:name, :type, :address, :configuration_id))
  33 + redirect_to @project
30 34  
31   - respond_to do |format|
32   - if @repository.save
33   - format.html { redirect_to @repository, notice: 'Repository was successfully created.' }
34   - format.json { render action: 'show', status: :created, location: @repository }
35   - else
36   - format.html { render action: 'new' }
37   - format.json { render json: @repository.errors, status: :unprocessable_entity }
38   - end
39   - end
  35 + #respond_to do |format|
  36 + # if @repository.save
  37 + # format.html { redirect_to @repository, notice: 'Repository was successfully created.' }
  38 + # format.json { render action: 'show', status: :created, location: @repository }
  39 + #else
  40 + # format.html { render action: 'new' }
  41 + #format.json { render json: @repository.errors, status: :unprocessable_entity }
  42 + #end
  43 + #end
40 44 end
41 45  
42 46 # PATCH/PUT /repositories/1
... ...
app/views/repositories/edit.html.erb
  Diff comments   View file @2f4de8a
... ... @@ -3,4 +3,4 @@
3 3 <%= render 'form' %>
4 4  
5 5 <%= link_to 'Show', @repository %> |
6   -<%= link_to 'Back', repositories_path %>
  6 +<%= link_to 'Back', project_repositories_path(@project) %>
... ...
app/views/repositories/edit.html.erb~ 0 → 100644
  Diff comments   View file @2f4de8a
... ... @@ -0,0 +1,6 @@
  1 +<h1>Editing repository</h1>
  2 +
  3 +<%= render 'form' %>
  4 +
  5 +<%= link_to 'Show', @repository %> |
  6 +<%= link_to 'Back', repositories_path %>
... ...
app/views/repositories/index.html.erb
  Diff comments   View file @2f4de8a
1   -<h1>Listing repositories</h1>
  1 +<h1>Listing Repositories</h1>
2 2  
3   -<table>
  3 +<table border="1" width="30%">
4 4 <thead>
5 5 <tr>
6 6 <th>Name</th>
7   - <th></th>
8   - <th></th>
9   - <th></th>
  7 + <th>Options</th>
10 8 </tr>
11 9 </thead>
12 10  
13 11 <tbody>
14 12 <% @repositories.each do |repository| %>
15 13 <tr>
16   - <td><%= repository.name %></td>
17   - <td><%= link_to 'Show', repository %></td>
18   - <td><%= link_to 'Edit', edit_repository_path(repository) %></td>
19   - <td><%= link_to 'Destroy', repository, method: :delete, data: { confirm: 'Are you sure?' } %></td>
  14 + <td align="center"><%= repository.name %></td>
  15 + <td align="center"><%= link_to 'Show', project_repository_path(@project, repository) %><br/>
  16 + <%= link_to 'Edit', edit_repository_path(repository) %><br/>
  17 + <%= link_to 'Destroy', repository, method: :delete, data: { confirm: 'Are you sure?' } %></td>
20 18 </tr>
21 19 <% end %>
22 20 </tbody>
... ...
app/views/repositories/index.html.erb~
  Diff comments   View file @2f4de8a
... ... @@ -14,7 +14,7 @@
14 14 <% @repositories.each do |repository| %>
15 15 <tr>
16 16 <td><%= repository.name %></td>
17   - <td><%= link_to 'Show', repository %></td>
  17 + <td><%= link_to 'Show', project_repository_path(@project, repository) %></td>
18 18 <td><%= link_to 'Edit', edit_repository_path(repository) %></td>
19 19 <td><%= link_to 'Destroy', repository, method: :delete, data: { confirm: 'Are you sure?' } %></td>
20 20 </tr>
... ... @@ -24,4 +24,4 @@
24 24  
25 25 <br>
26 26  
27   -<%= link_to 'New Repository', new_repository_path %>
  27 +<%= link_to 'New Repository', new_project_repository_path(@project) %>
... ...
app/views/repositories/new.html.erb~
  Diff comments   View file @2f4de8a
1   -<h1>New repository</h1>
  1 +<h1>New Repository</h1>
2 2  
3 3 <%= render 'form' %>
4 4  
... ...
app/views/repositories/show.html.erb
  Diff comments   View file @2f4de8a
... ... @@ -5,5 +5,5 @@
5 5 <%= @repository.name %>
6 6 </p>
7 7  
8   -<%= link_to 'Edit', edit_repository_path(@repository) %> |
9   -<%= link_to 'Back', repositories_path %>
  8 +<%= link_to 'Edit', edit_project_repository_path(@repository) %> |
  9 +<%= link_to 'Back', project_repositories_path(@project) %>
... ...
app/views/repositories/show.html.erb~ 0 → 100644
  Diff comments   View file @2f4de8a
... ... @@ -0,0 +1,9 @@
  1 +<p id="notice"><%= notice %></p>
  2 +
  3 +<p>
  4 + <strong>Name:</strong>
  5 + <%= @repository.name %>
  6 +</p>
  7 +
  8 +<%= link_to 'Edit', edit_repository_path(@repository) %> |
  9 +<%= link_to 'Back', project_repositories_path(@project) %>
... ...