alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Display enabled categories only

This commit is contained in:
manson 2014-05-12 16:29:20 +08:00
parent 0f0e17ef00
commit 48f3f96528
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/orbit_backend_helper.rb
View File

@ -80,11 +80,11 @@ module OrbitBackendHelper
end end
def select_category(f, module_app) def select_category(f, module_app)
render :partial => '/admin/categories/select_form', :locals => {:f=> f, :module_app=>module_app } render :partial => '/admin/categories/select_form', :locals => {:f=> f, :module_app=>module_app, :categories=>module_app.categories.enabled }
end end
def select_tag(f, module_app, object) def select_tag(f, module_app, object)
render :partial => '/admin/tags/tag_form', :locals => {:f=> f, :module_app=>module_app, :object=>object } render :partial => '/admin/tags/tag_form', :locals => {:f=> f, :module_app=>module_app, :object=>object, :tags=>module_app.tags }
end end
end end

4
app/views/admin/categories/_select_form.html.erb
View File

@ -1,5 +1,5 @@
<span id="select_categories"> <span id="select_categories">
<%= f.select :category_id, module_app.categories.collect{|t| [ t.title, t.id ]} %> <%= f.select :category_id, categories.collect{|t| [ t.title, t.id ]} %>
</span> </span>
<button class="btn" data-toggle="modal" data-target="#categoryModal"> <button class="btn" data-toggle="modal" data-target="#categoryModal">
<i class='icon-plus'></i> <%= t(:new_category) %> <i class='icon-plus'></i> <%= t(:new_category) %>
@ -30,7 +30,7 @@
<script type="text/javascript"> <script type="text/javascript">
$("#categoryModal").hide(); $("#categoryModal").hide();
$('#categoryModal').modal('<%= module_app.categories.blank? ? "show" : "hide" %>'); $('#categoryModal').modal('<%= categories.blank? ? "show" : "hide" %>');
$("#add_category").click(function(){ $("#add_category").click(function(){
createCategory(); createCategory();

4
app/views/admin/tags/_tag_form.html.erb
View File

@ -1,13 +1,13 @@
<div class="controls" data-toggle="buttons-checkbox"> <div class="controls" data-toggle="buttons-checkbox">
<span id="select_tags"> <span id="select_tags">
<% module_app.tags.each do |tag| %> <% tags.each do |tag| %>
<label class="checkbox inline btn <%= 'active' if object.tags.include?(tag) %>"> <label class="checkbox inline btn <%= 'active' if object.tags.include?(tag) %>">
<%= check_box_tag "#{object.class.name.camelize(:lower)}[tags][]", tag.id, object.tags.include?(tag) %> <%= tag.name %> <%= check_box_tag "#{object.class.name.camelize(:lower)}[tags][]", tag.id, object.tags.include?(tag) %> <%= tag.name %>
</label> </label>
<% end %> <% end %>
</span> </span>
</div> </div>
<button id="add_tag_btn" class="btn" data-toggle="modal" data-target="#tagModal" style="margin-left: <%= module_app.tags.blank? ? "10" : "180" %>px"> <button id="add_tag_btn" class="btn" data-toggle="modal" data-target="#tagModal" style="margin-left: <%= tags.blank? ? "10" : "180" %>px">
<i class='icon-plus'></i> <%= t(:new_tag) %> <i class='icon-plus'></i> <%= t(:new_tag) %>
</button> </button>