developers
/
archive_exam
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed sorting and also name issue for backend for files

This commit is contained in:
Harry Bomrah 2014-06-30 15:31:10 +08:00
parent c938fc2798
commit f4d405979b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/archives_controller.rb
View File

@ -17,14 +17,14 @@ class ArchivesController < ApplicationController
end end
end end
cats = @categories.collect do |cat| cats = @categories.collect do |cat|
archives = ArchiveFile.where(:category_id => cat["id"]).collect do |archive| archives = ArchiveFile.where(:category_id => cat["id"]).order_by(:sort_number=>'asc').collect do |archive|
statuses = archive.statuses_with_classname.collect do |status| statuses = archive.statuses_with_classname.collect do |status|
{ {
"status" => status["name"], "status" => status["name"],
"status-class" => "status-#{status['classname']}" "status-class" => "status-#{status['classname']}"
} }
end end
files = archive.archive_file_multiples.collect do |file| files = archive.archive_file_multiples.order_by(:sort_number=>'asc').collect do |file|
{ {
"file-name" => file.file_title, "file-name" => file.file_title,
"file-type" => file.file.file.extension.downcase, "file-type" => file.file.file.extension.downcase,

4
app/views/admin/archive_files/_form_file.html.erb
View File

@ -21,7 +21,7 @@
</label> </label>
<span class="add-on icons-pencil" title="<%= t('file.name') %>"></span> <span class="add-on icons-pencil" title="<%= t('file.name') %>"></span>
<span class="tab-content"> <span class="tab-content">
<% I18n.available_locales.each_with_index do |locale, i| %> <% @site_in_use_locales.each_with_index do |locale, i| %>
<span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>"> <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
<%= f.fields_for :file_title_translations do |f| %> <%= f.fields_for :file_title_translations do |f| %>
<%= f.text_field locale, :class => "input-medium", placeholder: t('file.name'), :value => (form_file.file_title_translations[locale] rescue nil) %> <%= f.text_field locale, :class => "input-medium", placeholder: t('file.name'), :value => (form_file.file_title_translations[locale] rescue nil) %>
@ -38,7 +38,7 @@
<span class="add-on btn-group btn" title="<%= t('archive.show_lang') %>"> <span class="add-on btn-group btn" title="<%= t('archive.show_lang') %>">
<i class="icons-earth"></i> <span class="caret"></span> <i class="icons-earth"></i> <span class="caret"></span>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<% I18n.available_locales.each do |locale| %> <% @site_in_use_locales.each do |locale| %>
<li> <li>
<label class="checkbox"> <label class="checkbox">
<%= check_box_tag "archive_file[archive_file_multiples_attributes][#{( form_file.new_record? ? 'new_archive_file_multiples' : "#{i}" )}][choose_lang][]", locale, (form_file.choose_lang.nil? ? true : form_file.choose_lang.include?(locale)) %> <%= check_box_tag "archive_file[archive_file_multiples_attributes][#{( form_file.new_record? ? 'new_archive_file_multiples' : "#{i}" )}][choose_lang][]", locale, (form_file.choose_lang.nil? ? true : form_file.choose_lang.include?(locale)) %>