diff --git a/vendor/built_in_modules/dictionary/app/helpers/panel/dictionary/back_end/dictionary_vocab_categorys_helper.rb b/vendor/built_in_modules/dictionary/app/helpers/panel/dictionary/back_end/dictionary_vocab_categorys_helper.rb new file mode 100644 index 000000000..e7d9bddd2 --- /dev/null +++ b/vendor/built_in_modules/dictionary/app/helpers/panel/dictionary/back_end/dictionary_vocab_categorys_helper.rb @@ -0,0 +1,15 @@ +module Panel::Dictionary::BackEnd::DictionaryVocabCategorysHelper +include ActionView::Helpers::UrlHelper + + + def show_anc_cate_permission_link(dictionary_vocab_category) + type = 'submit' + oa = dictionary_vocab_category.get_object_auth_by_title(type) + if oa.nil? + dictionary_vocab_category.object_auths.new(title: type ).save + oa = dictionary_vocab_category.get_object_auth_by_title(type) + end + link_to t(:category_auth),admin_object_auth_ob_auth_path(oa) + end + +end \ No newline at end of file diff --git a/vendor/built_in_modules/dictionary/app/models/dictionary_vocab_category.rb b/vendor/built_in_modules/dictionary/app/models/dictionary_vocab_category.rb index 4109b05a0..01c626da0 100644 --- a/vendor/built_in_modules/dictionary/app/models/dictionary_vocab_category.rb +++ b/vendor/built_in_modules/dictionary/app/models/dictionary_vocab_category.rb @@ -5,10 +5,10 @@ class DictionaryVocabCategory include OrbitCoreLib::ObjectAuthable include OrbitCoreLib::ObjectDisable include Sunspot::Mongo - # include Mongoid::MultiParameterAttributes - # APP_NAME = 'Archive' - # ObjectAuthTitlesOptions = %W{submit_new fact_check} - # AfterObjectAuthUrl = '/panel/archive/back_end/archive_file_categorys' + include Mongoid::MultiParameterAttributes + APP_NAME = 'Dictionary' + ObjectAuthTitlesOptions = %W{submit_new fact_check} + AfterObjectAuthUrl = '/panel/dictionary/back_end/dictionary_vocab_categorys' field :disable, type: Boolean, :default => false field :display @@ -36,7 +36,7 @@ class DictionaryVocabCategory end def self.from_id(id) - ArchiveFileCategory.find(id) rescue nil + DictionaryVocabCategory.find(id) rescue nil end end \ No newline at end of file diff --git a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocab_categorys/_dictionary_vocab_category.html.erb b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocab_categorys/_dictionary_vocab_category.html.erb index 4fc259123..b2262689b 100644 --- a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocab_categorys/_dictionary_vocab_category.html.erb +++ b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocab_categorys/_dictionary_vocab_category.html.erb @@ -5,9 +5,10 @@ diff --git a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocab_categorys/_form.html.erb b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocab_categorys/_form.html.erb index 68cf72597..77d51d5de 100644 --- a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocab_categorys/_form.html.erb +++ b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocab_categorys/_form.html.erb @@ -2,10 +2,10 @@ <%= form_for(@dictionary_vocab_category, :remote => true, :url => @url) do |f| %> -

<%= (@dictionary_vocab_category.new_record? ? 'Add' : 'Edit') %>

+

<%= (@dictionary_vocab_category.new_record? ? t(:new, scope: :dictionary) : t(:edit, scope: :dictionary)) %>

- <%= f.label :key %> + <%= f.label t(:key, scope: :dictionary) %> <%= f.text_field :key %>
@@ -13,7 +13,7 @@ <%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %>
- <%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %> + <%= label_tag "name-#{locale}", "#{t(:name)} - #{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
<%= f.text_field locale, :class =>' input-xxlarge', :value => (@dictionary_vocab_category.title_translations[locale] rescue nil) %>
diff --git a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocab_categorys/index.html.erb b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocab_categorys/index.html.erb index 5077dca4f..9753eb69c 100644 --- a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocab_categorys/index.html.erb +++ b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocab_categorys/index.html.erb @@ -3,9 +3,9 @@ - + <% @site_valid_locales.each do |locale| %> - + <% end %> diff --git a/vendor/built_in_modules/dictionary/config/locales/en.yml b/vendor/built_in_modules/dictionary/config/locales/en.yml index 89255ce7a..d1d04d002 100644 --- a/vendor/built_in_modules/dictionary/config/locales/en.yml +++ b/vendor/built_in_modules/dictionary/config/locales/en.yml @@ -21,3 +21,4 @@ en: definition: Definition time: Created time ago: ago + diff --git a/vendor/built_in_modules/dictionary/config/locales/zh_tw.yml b/vendor/built_in_modules/dictionary/config/locales/zh_tw.yml index 9e3d54cb7..dabfdcf03 100644 --- a/vendor/built_in_modules/dictionary/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/dictionary/config/locales/zh_tw.yml @@ -25,3 +25,6 @@ zh_tw: definition: 定義 time: 建立時間 ago: 前 + new: 新增 + edit: 修改 + key: 索引值
<%= t('dictionary_vocab_category.key') %><%= t(:key, scope: :dictionary) %><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %><%= I18nVariable.first(:conditions => { :key => locale })[I18n.locale] %>