商品マスタ登録まで

diff --git a/app/controllers/admin/style_categories_controller.rb b/app/controllers/admin/style_categories_controller.rb
index 75cd0cc..5b7d4a3 100644 (file)
--- a/app/controllers/admin/style_categories_controller.rb
+++ b/app/controllers/admin/style_categories_controller.rb
@@ -37,7 +37,7 @@ class Admin::StyleCategoriesController < Admin::BaseController
 
   private
   def object
-    if params[:id]
+    if not params[:id].blank?
       style_category = StyleCategory.find_by_id(params[:id])
       raise ActiveRecord::RecordNotFound unless style_category.style.retailer_id == session[:admin_user].retailer_id
     elsif params[:style_category] && params[:style_category][:style_id]

diff --git a/app/views/admin/product_styles/new.html.erb b/app/views/admin/product_styles/new.html.erb
index 26c559e..ea0f167 100644 (file)
--- a/app/views/admin/product_styles/new.html.erb
+++ b/app/views/admin/product_styles/new.html.erb
@@ -18,11 +18,11 @@
         </tr>
         <tr>
           <th>規格1</th>
-          <td><%= select_tag :style_id1, Style.select_options(@style1 && @style1.id)%></td>
+          <td><%= select_tag :style_id1, Style.select_options(@style1 && @style1.id, session[:admin_user].retailer_id)%></td>
         </tr>
         <tr>
           <th>規格2</th>
-          <td><%= select_tag :style_id2, Style.select_options(@style2 && @style2.id) %></td>
+          <td><%= select_tag :style_id2, Style.select_options(@style2 && @style2.id, session[:admin_user].retailer_id) %></td>
         </tr>
       </table>
 

diff --git a/app/views/admin/products/_form.html.erb b/app/views/admin/products/_form.html.erb
index 700445e..259d084 100644 (file)
--- a/app/views/admin/products/_form.html.erb
+++ b/app/views/admin/products/_form.html.erb
@@ -23,16 +23,7 @@
     </td>
   </tr>  
  <% end %>
- <%if session[:admin_user].master_shop? %>
-  <tr>
-    <th>販売元<span class="pnt">※</span></th>
-    <td><% retailers = Retailer.find(:all,:order=>'id')%>
-      <%= confirm_select(confirm_tag(:select, :product, :retailer_id, retailers.map{|s| [s.name,s.id]}), @product.retailer.name, "product") %>
-    </td>
-  </tr>  
-  <% else %>
-    <%= hidden_field_tag :retailer_id, session[:admin_user].retailer_id %>
- <% end %>
+ <%= hidden_field_tag "product[retailer_id]", session[:admin_user].retailer_id %>
  
   <tr>
     <th>カテゴリー名<span class="pnt">※</span></th>