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]
</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>
</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>