From d8b0613147833bbfcd9393ae437c781461a506df Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 23 Apr 2012 15:53:58 +0800 Subject: [PATCH] archive checkbox --- app/views/layouts/_side_bar.html.erb | 10 ---------- .../archive/app/models/archive_file.rb | 7 ++++++- .../archive/back_end/archive_files/_form.html.erb | 4 +--- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index debcffedc..01f041cc4 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -86,16 +86,6 @@ <% end -%> <% end -%> -<%= content_tag :li, :class => active_for_controllers('archive_files', 'tags', 'archive_file_categorys') do -%> - <%= link_to content_tag(:i, nil, :class => 'icons-archive') + t('admin.archive'), panel_archive_back_end_archive_files_path %> - <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('archive_files', 'tags', 'archive_file_categorys')) do -%> - <%= content_tag :li, link_to(t('admin.all_articles'), panel_archive_back_end_archive_files_path), :class => active_for_action('archive_file', 'index') %> - <%= content_tag :li, link_to(t('admin.add_new'), new_panel_archive_back_end_archive_file_path), :class => active_for_action('archive_file', 'new') %> - <%= content_tag :li, link_to(t('admin.categories'), panel_archive_back_end_archive_file_categorys_path), :class => active_for_action('archive_file_categorys', 'index') %> - <%= content_tag :li, link_to(t('admin.tags'), panel_archive_back_end_tags_path), :class => active_for_action('tags', 'index') %> - <% end -%> -<% end -%> - <%= content_tag :li, :class => active_for_controllers(nil) do -%> <%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), nil %> <% end -%> diff --git a/vendor/built_in_modules/archive/app/models/archive_file.rb b/vendor/built_in_modules/archive/app/models/archive_file.rb index d5cbeac7f..8bc32160a 100644 --- a/vendor/built_in_modules/archive/app/models/archive_file.rb +++ b/vendor/built_in_modules/archive/app/models/archive_file.rb @@ -7,6 +7,11 @@ class ArchiveFile PAYMENT_TYPES = @site_valid_locales +<<<<<<< HEAD +======= + PAYMENT_TYPES = @site_valid_locales + +>>>>>>> archive checkbox has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy has_and_belongs_to_many :tags, :class_name => "ArchiveTag" @@ -21,7 +26,7 @@ class ArchiveFile belongs_to :archive_file_category has_many :archive_file_multiples, :autosave => true, :dependent => :destroy - + accepts_nested_attributes_for :archive_file_multiples, :allow_destroy => true validates_presence_of :title diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb index 190b765fa..0b7cceab2 100644 --- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb +++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb @@ -112,9 +112,7 @@ - - - +