Nest under /organization scope users, inquiries and offers resources

enricostano · enricostano · commit 24bdac485437 · 2017-08-04T17:19:51.000+02:00
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
@@ -15,7 +15,7 @@ def users_as_json
         alt_phone: user.alt_phone,
         balance: membership.account_balance.to_i,
 
-        url: user_path(user),
+        url: organization_user_path(organization_id: membership.organization_id, id: user.id),
         edit_link: edit_user_path(user),
         cancel_link: cancel_member_path(membership),
         toggle_manager_link: toggle_manager_member_path(membership),
diff --git a/app/views/application/menus/_inquiries_list_link.html.erb b/app/views/application/menus/_inquiries_list_link.html.erb
@@ -1,5 +1,5 @@
-<li class="<%= "active" if current_page?(inquiries_path) %>">
-  <%= link_to inquiries_path do %>
+<li class="<%= "active" if current_page?(organization_inquiries_path(organization_id: @organization.id)) %>">
+  <%= link_to organization_inquiries_path(organization_id: @organization.id) do %>
     <%= glyph :inquiry %>
     <%= Inquiry.model_name.human(count: :many) %>
   <% end %>
diff --git a/app/views/application/menus/_offers_dashboard_link.html.erb b/app/views/application/menus/_offers_dashboard_link.html.erb
@@ -1,5 +1,5 @@
-<li class="<%= "active" if current_page?(dashboard_offers_path) %>">
-  <%= link_to dashboard_offers_path do %>
+<li class="<%= "active" if current_page?(organization_offers_path(organization_id: @organization.id)) %>">
+  <%= link_to organization_offers_path(organization_id: @organization.id) do %>
     <%= glyph :offer %>
     <%= Offer.model_name.human(count: :many) %>
   <% end %>
diff --git a/app/views/application/menus/_user_admin_menu.html.erb b/app/views/application/menus/_user_admin_menu.html.erb
@@ -25,7 +25,7 @@
       <li class="divider" role="presentation"></li>
     <% end %>
     <li role="presentation">
-      <%= link_to current_user do %>
+      <%= link_to organization_user_path(organization_id: @organization.id, id: current_user.id) do %>
         <%= glyph :user %>
         <%= t "layouts.application.edit_profile" %>
       <% end %>
diff --git a/app/views/application/menus/_user_list_link.html.erb b/app/views/application/menus/_user_list_link.html.erb
@@ -1,5 +1,5 @@
-<li class="<%= "active" if current_page?(users_path) %>">
-  <%= link_to users_path do %>
+<li class="<%= "active" if current_page?(organization_users_path(organization_id: @organization.id)) %>">
+  <%= link_to organization_users_path(organization_id: @organization.id) do %>
     <%= glyph :user %>
     <%= User.model_name.human(count: :many) %>
   <% end %>
diff --git a/app/views/inquiries/index.html.erb b/app/views/inquiries/index.html.erb
@@ -5,7 +5,7 @@
 </h1>
 
 <div class="navbar">
-  <form action="<%= inquiries_path %>"
+  <form action="<%= organization_inquiries_path(organization_id: @organization.id) %>"
         class="navbar-form navbar-left"
         method="get"
         role="search">
@@ -28,12 +28,12 @@
       </a>
       <ul class="dropdown-menu" role="menu">
         <li>
-          <%= link_to "× #{t("global.all")}", inquiries_path %>
+          <%= link_to "× #{t("global.all")}", organization_inquiries_path(organization_id: @organization.id) %>
         </li>
         <% Category.all.sort_by { |a| a.name.downcase }.each do |c| %>
           <% next if c == @category %>
           <li>
-            <%= link_to c.name, inquiries_path(cat: c.id) %>
+            <%= link_to c.name, organization_inquiries_path(organization_id: @organization.id, cat: c.id) %>
           </li>
         <% end %>
       </ul>
@@ -42,7 +42,7 @@
   <% if current_user && @organization %>
     <ul class="nav navbar-nav pull-right">
       <li>
-        <%= link_to new_inquiry_path do %>
+        <%= link_to new_organization_inquiry_path(@organization) do %>
           <%= glyph :plus %>
           <%= t "helpers.submit.create", model: Inquiry.model_name.human %>
         <% end %>
diff --git a/app/views/inquiries/show.html.erb b/app/views/inquiries/show.html.erb
@@ -1,10 +1,10 @@
 <p class="actions text-right">
   <% if admin? || @inquiry.user == current_user %>
-    <%= link_to edit_inquiry_path(@inquiry), class: "btn btn-warning" do %>
+    <%= link_to edit_organization_inquiry_path(@organization, @inquiry), class: "btn btn-warning" do %>
       <%= glyph :pencil %>
       <%= t "global.edit" %>
     <% end %>
-    <%= link_to @inquiry,
+    <%= link_to organization_inquiry_path(@organization, @inquiry),
                 data: { method: :delete, confirm: "sure?" },
                 class: "btn btn-danger" do %>
       <%= glyph :trash %>
diff --git a/app/views/offers/index.html.erb b/app/views/offers/index.html.erb
@@ -4,7 +4,7 @@
   <%= render "shared/show_filter_hint" %>
 </h1>
 <div class="navbar">
-  <form action="<%= offers_path %>"
+  <form action="<%= organization_offers_path(organization_id: @organization.id) %>"
         class="navbar-form navbar-left"
         method="get"
         role="search">
@@ -27,12 +27,12 @@
       </a>
       <ul class="dropdown-menu" role="menu">
         <li>
-          <%= link_to "× #{t 'global.all'}", dashboard_offers_path %>
+          <%= link_to "× #{t 'global.all'}", organization_offers_path(organization_id: @organization.id) %>
         </li>
         <% Category.all.sort_by { |a| a.name.downcase }.each do |c| %>
           <% next if c == @category %>
           <li>
-            <%= link_to c.name, offers_path(cat: c.id) %>
+            <%= link_to c.name, organization_offers_path(organization_id: @organization.id, cat: c.id) %>
           </li>
         <% end %>
       </ul>
@@ -41,7 +41,7 @@
   <% if current_user && @organization %>
     <ul class="nav navbar-nav pull-right">
       <li>
-        <%= link_to new_offer_path do %>
+        <%= link_to new_organization_offer_path(organization_id: @organization.id) do %>
           <%= glyph :plus %>
           <%= t "helpers.submit.create", model: Offer.model_name.human %>
         <% end %>
diff --git a/app/views/offers/show.html.erb b/app/views/offers/show.html.erb
@@ -1,18 +1,18 @@
 <p class="actions text-right">
   <% if admin? or @offer.user == current_user %>
-    <%= link_to edit_offer_path(@offer), class: "btn btn-warning" do %>
+    <%= link_to edit_organization_offer_path(@organization, @offer), class: "btn btn-warning" do %>
       <%= glyph :pencil %>
       <%= t "global.edit" %>
     <% end %>
-    <%= link_to @offer,
+    <%= link_to organization_offer_path(@organization, @offer),
                 data: { method: :DELETE, confirm: "sure?" },
                 class: "btn btn-danger" do %>
       <%= glyph :trash %>
       <%= t "global.delete" %>
     <% end %>
   <% end %>
   <% if current_user and @offer.user != current_user %>
-    <%= link_to give_time_user_path(@offer.user, offer: @offer.id),
+    <%= link_to give_time_organization_user_path(@organization, @offer.user, offer: @offer.id),
                 class: "btn btn-success" do %>
       <%= glyph :time %>
       <%= t ".give_time_for" %>
diff --git a/app/views/shared/_post_form.html.erb b/app/views/shared/_post_form.html.erb
@@ -1,5 +1,5 @@
 <%= show_error_messages! post %>
-<%= form_for post, html: { name: "form", novalidate: true } do |f| %>
+<%= form_for [@organization, post], html: { name: "form", novalidate: true } do |f| %>
   <div class="form-group">
     <%= f.label :title, required: true %>
     <%= f.text_field :title, class: "form-control" %>
diff --git a/app/views/shared/_posts.html.erb b/app/views/shared/_posts.html.erb
@@ -1,7 +1,7 @@
 <% posts.each do |post| %>
   <div class="post">
     <h4>
-      <%= link_to post.title, post %>
+      <%= link_to post.title, polymorphic_url([@organization, post]) %>
     </h4>
     <p>
       <%= strip_tags(post.rendered_description.to_html) %>
@@ -16,7 +16,7 @@
         <% end %>
         <% (post.tags || []).each do |tag| %>
           <%= glyph :tag %>
-          <%= link_to tag, get_index_path(post,tag: tag) %>
+          <%= link_to tag, get_index_path(post, tag: tag) %>
         <% end %>
         <% if post.type == "Inquiry" %>
           <span class="pull-right">
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
@@ -21,7 +21,7 @@
     <ul class="nav navbar-nav pull-right">
       <% if admin? %>
         <li>
-          <a href="<%= new_user_path %>">
+          <a href="<%= new_organization_user_path(organization_id: @organization.id) %>">
             <span class="glyphicon glyphicon-plus"></span>
             <%= t "helpers.submit.create", model: User.model_name.human %>
           </a>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
@@ -38,7 +38,7 @@
           <% end %>
           <% if admin? || @user != current_user %>
             <li>
-              <%= link_to give_time_user_path(@user) do %>
+              <%= link_to give_time_organization_user_path(organization_id: @organization.id, id: @user.id) do %>
                 <%= glyph :time %>
                 <%= t "global.give_time" %>
               <% end %>
@@ -110,7 +110,7 @@
         <h2 class="panel-title">
           <%= Inquiry.model_name.human(count: :many) %>
           <% if @user == current_user %>
-            <a class="pull-right" href="<%= new_inquiry_path %>">
+            <a class="pull-right" href="<%= new_organization_inquiry_path(organization_id: @organization.id) %>">
               <%= glyph :plus %>
             </a>
           <% end %>
diff --git a/config/routes.rb b/config/routes.rb
@@ -11,26 +11,22 @@
 
   get "global/switch_lang", as: :switch_lang
 
-  resources :offers do
-    collection do
-      get :dashboard
-    end
-  end
-
-  resources :inquiries
+  resources :users, only: [:show, :edit]
 
   concern :accountable do
     get :give_time, on: :member
   end
 
   resources :organizations, concerns: :accountable do
-    member do
-      post :set_current
-    end
+    # TODO: 'members' path is misleading, there is already a resource called 'members'
+    resources :users,
+      concerns: :accountable,
+      except: [:show, :edit, :destroy],
+      path: 'members'
+    resources :inquiries
+    resources :offers
   end
 
-  resources :users, concerns: :accountable, except: :destroy, :path => "members"
-
   resources :transfers, only: [:create] do
     member do
       put :delete_reason
@@ -77,5 +73,4 @@
       get "offers"
     end
   end
-
 end
