saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/old_ui_tags_patch.diff

2777 lines
126 KiB
Diff
Raw Blame History

From 3cac67a6f32cf42a9b96ccf425f5094a602ead71 Mon Sep 17 00:00:00 2001
From: chris <chris.vilayphiou@gmail.com>
Date: Mon, 22 Apr 2013 19:34:37 +0800
Subject: [PATCH] New tags but still without global tag management
---
app/controllers/admin/tags_controller.rb | 28 ++------
app/controllers/orbit_backend_controller.rb | 15 +++++
app/models/module_app.rb | 10 +--
app/models/tag.rb | 5 +-
app/models/tagging.rb | 9 +++
app/views/admin/assets/_asset.html.erb | 2 +-
app/views/admin/assets/_form.html.erb | 2 +-
.../page_parts/_widget_data_source_tag.html.erb | 2 +-
app/views/admin/tags/_add.html.erb | 10 +--
app/views/admin/tags/_form.html.erb | 10 +--
app/views/admin/tags/_tag.html.erb | 4 +-
.../admin/users_new_interface/_filter.html.erb | 2 +-
lib/orbit_tag.rb | 3 +
lib/orbit_tag/taggable.rb | 77 ++++++++++++++++++++++
.../announcement/back_end/bulletins_controller.rb | 19 ++----
.../announcement/app/models/bulletin.rb | 25 +++----
.../back_end/bulletins/_bulletin.html.erb | 2 +-
.../back_end/bulletins/_filter_tags.html.erb | 2 +-
.../announcement/back_end/bulletins/_form.html.erb | 2 +-
.../back_end/bulletins/_quick_edit_tags.html.erb | 2 +-
.../panel/announcement/plugin/_profile.html.erb | 2 +-
.../announcement/widget/bulletins/_tag.html.erb | 2 +-
.../widget/bulletins/bulletins_list.html.erb | 2 +-
vendor/built_in_modules/announcement/init.rb | 2 +-
.../archive/back_end/archive_files_controller.rb | 13 ++--
.../archive/app/models/archive_file.rb | 5 +-
.../back_end/archive_files/_archive_file.html.erb | 2 +-
.../back_end/archive_files/_filter_tags.html.erb | 2 +-
.../archive/back_end/archive_files/_form.html.erb | 2 +-
.../archive/widget/archive_files/_tag.html.erb | 2 +-
.../widget/archive_files/bulletins_list.html.erb | 2 +-
vendor/built_in_modules/archive/init.rb | 2 +-
vendor/built_in_modules/calendar/app/models/cal.rb | 3 +
vendor/built_in_modules/calendar/init.rb | 2 +-
.../panel/faq/back_end/qas_controller.rb | 15 ++---
vendor/built_in_modules/faq/app/models/qa.rb | 5 +-
.../panel/faq/back_end/qas/_filter_tags.html.erb | 2 +-
.../views/panel/faq/back_end/qas/_form.html.erb | 2 +-
.../app/views/panel/faq/back_end/qas/_qa.html.erb | 2 +-
vendor/built_in_modules/faq/init.rb | 2 +-
.../gallery/app/models/gallery_album.rb | 5 +-
.../gallery/back_end/album_images/show.html.erb | 2 +-
.../panel/gallery/back_end/albums/edit.html.erb | 2 +-
.../panel/gallery/back_end/albums/index.html.erb | 2 +-
.../panel/gallery/back_end/albums/show.html.erb | 2 +-
.../front_end/orbit_galleries/index.html.erb | 2 +-
vendor/built_in_modules/gallery/init.rb | 2 +-
.../back_end/writing_books_controller.rb | 15 ++---
.../front_end/writing_books_controller.rb | 6 --
.../plugin/writing_books_controller.rb | 13 ++--
.../back_end/writing_books/_form.html.erb | 2 +-
.../plugin/writing_books/_form.html.erb | 2 +-
.../back_end/writing_conferences_controller.rb | 15 ++---
.../front_end/writing_seminars_controller.rb | 5 --
.../plugin/writing_conferences_controller.rb | 13 ++--
.../back_end/writing_conferences/_form.html.erb | 2 +-
.../plugin/writing_conferences/_form.html.erb | 2 +-
.../back_end/diplomas_controller.rb | 15 ++---
.../personal_diploma/plugin/diplomas_controller.rb | 15 ++---
.../back_end/diplomas/_form.html.erb | 2 +-
.../plugin/diplomas/_form.html.erb | 2 +-
.../back_end/experiences_controller.rb | 15 ++---
.../plugin/experiences_controller.rb | 15 ++---
.../back_end/experiences/_form.html.erb | 2 +-
.../plugin/experiences/_form.html.erb | 2 +-
.../personal_honor/back_end/honors_controller.rb | 15 ++---
.../personal_honor/front_end/honors_controller.rb | 5 --
.../personal_honor/plugin/honors_controller.rb | 15 ++---
.../personal_honor/back_end/honors/_form.html.erb | 2 +-
.../personal_honor/plugin/honors/_form.html.erb | 2 +-
.../back_end/writing_journals_controller.rb | 15 ++---
.../front_end/writing_journals_controller.rb | 5 --
.../plugin/writing_journals_controller.rb | 13 ++--
.../writing_journals/_filter_tags.html.erb | 2 +-
.../back_end/writing_journals/_form.html.erb | 2 +-
.../plugin/writing_journals/_form.html.erb | 2 +-
.../panel/personal_lab/back_end/labs_controller.rb | 15 ++---
.../panel/personal_lab/plugin/labs_controller.rb | 15 ++---
.../personal_lab/back_end/labs/_form.html.erb | 2 +-
.../panel/personal_lab/plugin/labs/_form.html.erb | 2 +-
.../back_end/writing_patents_controller.rb | 15 ++---
.../front_end/writing_patents_controller.rb | 5 --
.../plugin/writing_patents_controller.rb | 13 ++--
.../back_end/writing_patents/_form.html.erb | 2 +-
.../plugin/writing_patents/_form.html.erb | 2 +-
.../back_end/projects_controller.rb | 15 ++---
.../front_end/projects_controller.rb | 5 --
.../personal_project/plugin/projects_controller.rb | 13 ++--
.../back_end/projects/_form.html.erb | 2 +-
.../plugin/projects/_form.html.erb | 2 +-
.../back_end/researchs_controller.rb | 13 ++--
.../front_end/researchs_controller.rb | 7 +-
.../plugin/researchs_controller.rb | 13 ++--
.../back_end/researchs/_filter_tags.html.erb | 2 +-
.../back_end/researchs/_form.html.erb | 2 +-
.../plugin/researchs/_form.html.erb | 2 +-
.../web_resource/back_end/web_links_controller.rb | 13 ++--
.../web_resource/widget/web_links_controller.rb | 5 --
.../web_resource/app/models/web_link.rb | 5 +-
.../web_resource/back_end/web_links/_form.html.erb | 2 +-
.../back_end/web_links/_web_link.html.erb | 2 +-
.../web_resource/widget/web_links/_index.html.erb | 2 +-
vendor/built_in_modules/web_resource/init.rb | 2 +-
103 files changed, 336 insertions(+), 382 deletions(-)
create mode 100644 app/models/tagging.rb
create mode 100644 lib/orbit_tag.rb
create mode 100644 lib/orbit_tag/taggable.rb
diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb
index 8e8a4e6..a94f62d 100644
--- a/app/controllers/admin/tags_controller.rb
+++ b/app/controllers/admin/tags_controller.rb
@@ -2,16 +2,10 @@ class Admin::TagsController < OrbitBackendController
before_filter :force_order_for_visitor,:only=>[:index]
before_filter :force_order_for_user,:except => [:index]
before_filter :for_app_sub_manager,:except => [:index]
-
-
- # layout 'new_admin'
- # before_filter :authenticate_user!
- # before_filter :is_admin?
- # before_filter :set_module_app
+ before_filter :set_module_app
def index
- get_tags
- @module_app_id = @module_app.id rescue nil
+ @tags = get_tags
end
def new
@@ -23,12 +17,7 @@ class Admin::TagsController < OrbitBackendController
end
def create
- if params[:tag][:module_app_id].blank?
- @tag = Tag.create(params[:tag])
- else
- module_app = ModuleApp.find(params[:tag][:module_app_id])
- @tag = eval("#{module_app.key.camelize}Tag").create(params[:tag])
- end
+ @tag = @module_app ? @module_app.tags.create(params[:tag]) : Tag.create(params[:tag])
end
def update
@@ -47,15 +36,12 @@ class Admin::TagsController < OrbitBackendController
protected
def get_tags
- @tags = (@module_app ? @module_app.tags : Tag.all)
+ @tags = @module_app.blank? ? Tag.all : @module_app.tags
end
- def setup_vars
- @app_key = request.env['HTTP_REFERER'].split('/')[4]
- if @app_key
- @app_key.gsub!(/[?].*/, '')
- @module_app = ModuleApp.first(conditions: {:key => @app_key})
- end
+ def set_module_app
+ @module_app = ModuleApp.find(params[:module_app_id]) if params[:module_app_id]
+ @module_app_id = @module_app.id rescue nil
end
end
diff --git a/app/controllers/orbit_backend_controller.rb b/app/controllers/orbit_backend_controller.rb
index 7c25e6f..338c9d1 100644
--- a/app/controllers/orbit_backend_controller.rb
+++ b/app/controllers/orbit_backend_controller.rb
@@ -1,6 +1,7 @@
class OrbitBackendController < ApplicationController
include OrbitCoreLib::AppBackendUtility
include OrbitCoreLib::PermissionUtility
+ include OrbitTag::Tagging
include AdminHelper
include ApplicationHelper
@@ -59,6 +60,20 @@ class OrbitBackendController < ApplicationController
when :referenced_in
objects = get_objects_from_referenced_objects(object_class.relations[option].class_name.constantize, objects, "#{option}_id")
end
+ elsif option.eql?('tags')
+ tag_array = @module_app.tags.inject([]){ |result, value|
+ result << [value.name, value]
+ }
+ params[:direction].eql?('asc') ? tag_array.sort : tag_array.sort.reverse!
+ sorted_objects = Array.new
+ tag_array.each do |x|
+ taggings = x[1].taggings
+ taggings.each {|tagging| sorted_objects << tagging.taggable }
+ end
+ # debugger
+ sorted_objects.flatten!
+ sorted_objects.uniq!
+ objects = get_with_nil(objects, option, sorted_objects)
end
end
end
diff --git a/app/models/module_app.rb b/app/models/module_app.rb
index 80b2161..649e135 100644
--- a/app/models/module_app.rb
+++ b/app/models/module_app.rb
@@ -8,6 +8,8 @@ class ModuleApp
field :title
field :sidebar_order,type: Integer,default: 0
+ has_many :tags, as: :module_tag, dependent: :destroy
+
def refetch_setting!(reg)
# %w{module_label category base_url version organization author intro update_info create_date}.each do |field|
# self[field.to_sym] = reg.send field
@@ -118,10 +120,6 @@ class ModuleApp
has_one :app_auth,dependent: :delete
- def get_tags
- get_registration.get_tags
- end
-
def get_categories
get_registration.get_categories
end
@@ -133,5 +131,9 @@ class ModuleApp
def get_registration
OrbitApp::Module::Registration.find_by_key(key)
end
+
+ def self.find_by_key(key)
+ self.where(key: key)[0] rescue nil
+ end
end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 29cc92a..30acb4c 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -10,10 +10,13 @@ class Tag
is_impressionable :counter_cache => { :column_name => :view_count }
- field :key
+ field :name, localize: true
field :view_count, :type => Integer, :default => 0
field :cloud_view_count, :type => Integer, :default => 0
+ belongs_to :module_tag, polymorphic: true
+ has_many :taggings, dependent: :destroy
+
#field :cloud_amper,:type: Integer,:default=> 0
def self.sorted_for_cloud
diff --git a/app/models/tagging.rb b/app/models/tagging.rb
new file mode 100644
index 0000000..b244ce8
--- /dev/null
+++ b/app/models/tagging.rb
@@ -0,0 +1,9 @@
+class Tagging
+ include Mongoid::Document
+ include Mongoid::Timestamps
+
+ field :to_destroy, default: false
+
+ belongs_to :tag
+ belongs_to :taggable, polymorphic: true
+end
\ No newline at end of file
diff --git a/app/views/admin/assets/_asset.html.erb b/app/views/admin/assets/_asset.html.erb
index 3b4ae87..27d4a20 100644
--- a/app/views/admin/assets/_asset.html.erb
+++ b/app/views/admin/assets/_asset.html.erb
@@ -17,7 +17,7 @@
<div class="label-group">
<div class="label-td">
<% asset.sorted_tags.each do |tag| %>
- <span class="label label-tags"><%= tag[I18n.locale] %></span>
+ <span class="label label-tags"><%= tag.name %></span>
<% end %>
</div>
</div>
diff --git a/app/views/admin/assets/_form.html.erb b/app/views/admin/assets/_form.html.erb
index 7941ecb..32817f8 100644
--- a/app/views/admin/assets/_form.html.erb
+++ b/app/views/admin/assets/_form.html.erb
@@ -25,7 +25,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label, :class => "checkbox inline" do -%>
<%= check_box_tag 'asset[tag_ids][]', tag.id, @asset.tag_ids.include?(tag.id) %>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'asset[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/app/views/admin/page_parts/_widget_data_source_tag.html.erb b/app/views/admin/page_parts/_widget_data_source_tag.html.erb
index c067aed..c4c7a66 100644
--- a/app/views/admin/page_parts/_widget_data_source_tag.html.erb
+++ b/app/views/admin/page_parts/_widget_data_source_tag.html.erb
@@ -13,7 +13,7 @@
<%= nil_checkbox_button(object,:tag) %>
<%= content_tag_for(:label, @tags,:class=>"radio inline") do |tag|%>
<%= check_box_tag("#{field_name}[tag][]", tag.id, tag_checked_value(object,tag.id),:class=>'select_option' ) %>
- <%= tag[I18n.locale]%>
+ <%= tag.name%>
<% end if @tags%>
</fieldset>
<% else %>
diff --git a/app/views/admin/tags/_add.html.erb b/app/views/admin/tags/_add.html.erb
index 986096f..d09a74a 100644
--- a/app/views/admin/tags/_add.html.erb
+++ b/app/views/admin/tags/_add.html.erb
@@ -1,7 +1,9 @@
<%= form_for :tag, :url => admin_tags_path, :remote => true, :html => {:id => 'tag_form'} do |f| %>
- <% @site_valid_locales.each do |locale| %>
- <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale %>
- <% end %>
- <%= f.hidden_field :module_app_id, :value => @module_app_id %>
+ <%= f.fields_for :name_translations do |f| %>
+ <% @site_valid_locales.each do |locale| %>
+ <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale %>
+ <% end %>
+ <% end %>
+ <%= hidden_field_tag :module_app_id, @module_app_id %>
<%= f.submit t(:add) %>
<% end %>
\ No newline at end of file
diff --git a/app/views/admin/tags/_form.html.erb b/app/views/admin/tags/_form.html.erb
index f097fcf..9628e01 100644
--- a/app/views/admin/tags/_form.html.erb
+++ b/app/views/admin/tags/_form.html.erb
@@ -1,7 +1,9 @@
<%= form_for :tag, :url => admin_tag_path(tag), :method => :put, :remote => true do |f| %>
- <% @site_valid_locales.each do |locale| %>
- <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale %>
- <% end %>
- <%= f.hidden_field :module_app_id, :value => tag.module_app_id %>
+ <%= f.fields_for :name_translations do |f| %>
+ <% @site_valid_locales.each do |locale| %>
+ <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale %>
+ <% end %>
+ <% end %>
+ <%= hidden_field_tag :module_app_id, @module_app_id %>
<%= f.submit t(:update_) %>
<% end %>
\ No newline at end of file
diff --git a/app/views/admin/tags/_tag.html.erb b/app/views/admin/tags/_tag.html.erb
index 26f67fd..d8e43df 100644
--- a/app/views/admin/tags/_tag.html.erb
+++ b/app/views/admin/tags/_tag.html.erb
@@ -3,11 +3,11 @@
<i class="icons-tag"></i>
<% @site_valid_locales.each do |locale| %>
<%#= I18nVariable.from_locale(locale) %>
- <%= tag[locale] %>
+ <%= tag.name_translations[locale] %>
<% end %>
</div>
<div class="action">
- <%= link_to t(:edit), edit_admin_tag_path(tag), :remote => true %>
+ <%= link_to t(:edit), edit_admin_tag_path(tag, :module_app_id => @module_app_id), :remote => true %>
<%= link_to t(:delete_), admin_tag_path(tag), :confirm => t('sure?'), :method => :delete, :remote => true %>
</div>
</div>
\ No newline at end of file
diff --git a/app/views/admin/users_new_interface/_filter.html.erb b/app/views/admin/users_new_interface/_filter.html.erb
index 1c694c0..d568f4f 100644
--- a/app/views/admin/users_new_interface/_filter.html.erb
+++ b/app/views/admin/users_new_interface/_filter.html.erb
@@ -48,7 +48,7 @@
<div class="accordion-body collapse" id="collapse-tags">
<div class="accordion-inner" data-toggle="buttons-checkbox">
<% @sub_role_tags.each do |sr_tag|%>
- <a href="#" class="btn"><%= sr_tag[I18n.locale] %></a>
+ <a href="#" class="btn"><%= sr_tag.name %></a>
<% end -%>
</div>
<div class="filter-clear">
diff --git a/lib/orbit_tag.rb b/lib/orbit_tag.rb
new file mode 100644
index 0000000..0555249
--- /dev/null
+++ b/lib/orbit_tag.rb
@@ -0,0 +1,3 @@
+# require "action_view"
+
+require "orbit_tag/taggable"
diff --git a/lib/orbit_tag/taggable.rb b/lib/orbit_tag/taggable.rb
new file mode 100644
index 0000000..18fba1b
--- /dev/null
+++ b/lib/orbit_tag/taggable.rb
@@ -0,0 +1,77 @@
+module OrbitTag
+ module Taggable
+ extend ActiveSupport::Concern
+
+ module ClassMethods
+
+ def taggable
+ init_tag
+ end
+
+ private
+
+ def init_tag
+ class_eval do
+ field :tags_to_destroy, type: Array, default: []
+
+ has_many :taggings, as: :taggable, autosave: true, dependent: :destroy
+ accepts_nested_attributes_for :taggings, allow_destroy: true
+ after_save :remove_taggings, unless: Proc.new{self.tags_to_destroy.blank?}
+
+ def tags
+ self.taggings.blank? ? [] : self.taggings.map{|t| t.tag}
+ end
+
+ def tags=(tag_ids)
+ tag_ids = [tag_ids].flatten
+ tag_ids.delete('')
+ ids = self.taggings.blank? ? [] : self.taggings.map{|t| t.tag.id}
+ tag_ids.each do |tag_id|
+ unless ids.include? tag_id
+ self.taggings.build(tag_id: tag_id)
+ end
+ end
+ self.tags_to_destroy = self.taggings.where(:tag_id.in => (ids - tag_ids)).map{|t| t.id}
+ end
+
+ def tag_ids
+ self.taggings.blank? ? [] : self.taggings.map{|t| t.tag.id}
+ end
+
+ def tag_ids=(ids)
+ self.tags = ids
+ end
+
+ def sorted_tags
+ if tags.blank?
+ []
+ else
+ tag_array = tags.inject([]){ |result, value|
+ result << [value.name, value]
+ }
+ tag_array.sort.map{|x| x[1] }
+ end
+ end
+
+ private
+
+ def remove_taggings
+ self.taggings.where(:_id.in => self.tags_to_destroy).destroy
+ self.class.without_callback(:save, :after, :remove_taggings) do
+ self.update_attribute(:tags_to_destroy, [])
+ end
+ end
+ end
+ end
+
+ end
+
+ end
+
+ module Tagging
+ extend OrbitCoreLib::AppBackendUtility
+ def get_tags
+ @module_app ? @module_app.tags : Tag.all
+ end
+ end
+end
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
index 5ec65b3..e45ced1 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
@@ -25,7 +25,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
# @bulletins = Bulletin.all
# @bulletins = Bulletin.desc("postdate desc")
get_categorys('BulletinCategory',params[:bulletin_category_id])
- get_tags
+ @tags = get_tags
@filter = params[:filter]
new_filter = params[:new_filter]
@@ -66,7 +66,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
# GET /bulletins/1.xml
def show
@bulletin = Bulletin.find(params[:id])
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # show.html.erb
@@ -85,7 +85,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
end
@link_url = panel_announcement_back_end_bulletins_path
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
format.xml { render :xml => @bulletin }
@@ -102,14 +102,14 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
@link_url = panel_announcement_back_end_bulletin_path(@bulletin)
- get_tags
+ @tags = get_tags
end
end
# POST /bulletins
# POST /bulletins.xml
def create
- get_tags
+ @tags = get_tags
if params[:bulletin_link]
@bulletin_link = BulletinLink.new(params[:bulletin_link])
@@ -240,7 +240,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
format.js { render 'toggle_enable' }
format.xml { head :ok }
else
- get_tags
+ @tags = get_tags
format.html { render :action => "edit" }
format.xml { render :xml => @bulletin.errors, :status => :unprocessable_entity }
end
@@ -280,7 +280,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
@bulletin_categories = BulletinCategory.all
#TODO 需要做 manager ,admin 才可以 all. 其他 available就好
- get_tags
+ @tags = get_tags
end
def delete
@@ -327,11 +327,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
# end
# end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'announcement'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc) rescue []
- end
-
def clean_values
if params[:bulletin]
params[:bulletin][:bulletin_links_attributes].each_with_index do |link, index|
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb
index 602ad86..77577ad 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb
@@ -11,13 +11,16 @@ class Bulletin
include OrbitCoreLib::BelongsToCategoryMayDisable
include OrbitCoreLib::Preview
+ include OrbitTag::Taggable
+ taggable
+
is_impressionable :counter_cache => { :column_name => :view_count }
field :title, localize: true
field :subtitle, localize: true
field :text, localize: true
- has_and_belongs_to_many :tags, :class_name => "AnnouncementTag"
+ # has_and_belongs_to_many :tags, :class_name => "AnnouncementTag"
field :postdate , :type => DateTime
field :deadline , :type => DateTime
@@ -51,7 +54,7 @@ class Bulletin
validates :title, :at_least_one => true
- before_save :check_deadline, :update_avliable_language, :clean_values#, :save_bulletin_links, :save_bulletin_files
+ before_save :check_deadline, :update_avliable_language#, :clean_values#, :save_bulletin_links, :save_bulletin_files
searchable do
text :titles do
@@ -196,9 +199,9 @@ class Bulletin
return nil
end
- def sorted_tags
- tags.order_by(I18n.locale, :asc)
- end
+ # def sorted_tags
+ # tags.order_by(I18n.locale, :asc)
+ # end
def to_preview
@@ -236,12 +239,12 @@ class Bulletin
end
end
- def clean_values
- self.bulletin_links.each do |link|
- link.delete if link.url.blank? && link.title.blank?
- end
- self.tag_ids.delete('')
- end
+ # def clean_values
+ # self.bulletin_links.each do |link|
+ # link.delete if link.url.blank? && link.title.blank?
+ # end
+ # self.tag_ids.delete('')
+ # end
end
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
index c916acf..85b9a4b 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
@@ -67,7 +67,7 @@
<div class="label-group">
<div class="label-td">
<% bulletin.sorted_tags.each do |tag| %>
- <span class="label label-tags"><%= tag[I18n.locale] %></span>
+ <span class="label label-tags"><%= tag.name %></span>
<% end %>
</div>
</div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_tags.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_tags.html.erb
index c40bf37..c01e9f5 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_tags.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_tags.html.erb
@@ -1,6 +1,6 @@
<div class="accordion-inner" data-toggle="buttons-checkbox">
<% @tags.each do |tag| -%>
- <%= link_to tag[I18n.locale], panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'tags', :id => tag.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small js_history#{is_filter_active?('tags', tag.id)}" %>
+ <%= link_to tag.name, panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'tags', :id => tag.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small js_history#{is_filter_active?('tags', tag.id)}" %>
<% end -%>
</div>
<%= render :partial => 'clear_filters', :locals => {:type => 'tags'} %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index a51c41f..2896087 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -99,7 +99,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'bulletin[tag_ids][]', tag.id, @bulletin.tag_ids.include?(tag.id) %>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'bulletin[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_tags.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_tags.html.erb
index c3bf4b3..b5a9aa0 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_tags.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_tags.html.erb
@@ -5,7 +5,7 @@
<% @tags.each do |tag| %>
<label class="checkbox inline">
<%= check_box_tag 'bulletin[tag_ids][]', tag.id, bulletin.tag_ids.include?(tag.id) %>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
</label>
<%= hidden_field_tag 'bulletin[tag_ids][]', '' %>
<% end %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/plugin/_profile.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/plugin/_profile.html.erb
index 5bb852e..9c84039 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/plugin/_profile.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/plugin/_profile.html.erb
@@ -40,7 +40,7 @@
<td>
<div class="label-group">
<% bulletin.sorted_tags.each do |tag| %>
- <span class="label label-tags"><%= tag[I18n.locale] %></span>
+ <span class="label label-tags"><%= tag.name %></span>
<% end %>
</div>
</td>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_tag.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_tag.html.erb
index b8d32dc..6188bfe 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_tag.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_tag.html.erb
@@ -1,3 +1,3 @@
<li>
- <%= link_to tag[I18n.locale], panel_announcement_widget_bulletins_and_web_links_path(:id => tag.id), :remote => true, :class => ('active' if tag.eql?(@selected_tag)) %>
+ <%= link_to tag.name, panel_announcement_widget_bulletins_and_web_links_path(:id => tag.id), :remote => true, :class => ('active' if tag.eql?(@selected_tag)) %>
</li>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_list.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_list.html.erb
index 2d3f198..a07d112 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_list.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_list.html.erb
@@ -5,7 +5,7 @@
<div class="tag_block">
<ul class="tag_list">
<% @tags.each do |tag| %>
- <li><%= tag[I18n.locale] %></li>
+ <li><%= tag.name %></li>
<% end %>
</ul>
</div>
diff --git a/vendor/built_in_modules/announcement/init.rb b/vendor/built_in_modules/announcement/init.rb
index c0178c0..72977f7 100644
--- a/vendor/built_in_modules/announcement/init.rb
+++ b/vendor/built_in_modules/announcement/init.rb
@@ -70,7 +70,7 @@ module Announcement
context_link 'tags',
- :link_path=>"panel_announcement_back_end_tags_path" ,
+ :link_path=>"admin_tags_path(:module_app_id => ModuleApp.first(conditions: {title: 'Announcement'}))" ,
:priority=>4,
# :active_for_action=>{:bulletin_categorys=>:index},
:available_for => [:manager]
diff --git a/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_files_controller.rb b/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_files_controller.rb
index 512fb11..79712fb 100644
--- a/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_files_controller.rb
+++ b/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_files_controller.rb
@@ -34,7 +34,7 @@ class Panel::Archive::BackEnd::ArchiveFilesController < OrbitBackendController
@archive_files = (params[:sort] || @filter) ? get_sorted_and_filtered("archive_file",:archive_file_category_id.in => @archive_file_category_ids) : get_viewable("archive_file",:archive_file_category_id.in => @archive_file_category_ids)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -59,7 +59,7 @@ class Panel::Archive::BackEnd::ArchiveFilesController < OrbitBackendController
def new
@archive_file = ArchiveFile.new
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -71,7 +71,7 @@ class Panel::Archive::BackEnd::ArchiveFilesController < OrbitBackendController
def edit
@archive_file = ArchiveFile.find(params[:id])
- get_tags
+ @tags = get_tags
end
# POST /archive_files
@@ -86,7 +86,7 @@ class Panel::Archive::BackEnd::ArchiveFilesController < OrbitBackendController
format.html { redirect_to(panel_archive_back_end_archive_files_url) }
format.xml { render :xml => @archive_file, :status => :created, :location => @archive_file }
else
- get_tags
+ @tags = get_tags
format.html { render :action => "new" }
format.xml { render :xml => @archive_file.errors, :status => :unprocessable_entity }
end
@@ -139,9 +139,4 @@ class Panel::Archive::BackEnd::ArchiveFilesController < OrbitBackendController
# @archive_file_categorys = (id ? ArchiveFileCategory.find(id).to_a : ArchiveFileCategory.excludes('disabled' => true))
# end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'archive'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
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 bb44969..030d506 100644
--- a/vendor/built_in_modules/archive/app/models/archive_file.rb
+++ b/vendor/built_in_modules/archive/app/models/archive_file.rb
@@ -10,9 +10,12 @@ class ArchiveFile
PAYMENT_TYPES = @site_valid_locales
+ include OrbitTag::Taggable
+ taggable
+
field :title, localize: true
- has_and_belongs_to_many :tags, :class_name => "ArchiveTag"
+ # has_and_belongs_to_many :tags, :class_name => "ArchiveTag"
field :create_user_id
field :update_user_id
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_archive_file.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_archive_file.html.erb
index 3c77820..a746d59 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_archive_file.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_archive_file.html.erb
@@ -36,7 +36,7 @@
<div class="label-group">
<div class="label-td">
<% archive_file.sorted_tags.each do |tag| %>
- <span class="label label-tags"><%= tag[I18n.locale] %></span>
+ <span class="label label-tags"><%= tag.name %></span>
<% end %>
</div>
</div>
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_filter_tags.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_filter_tags.html.erb
index e0eb154..743521d 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_filter_tags.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_filter_tags.html.erb
@@ -1,6 +1,6 @@
<div class="accordion-inner" data-toggle="buttons-checkbox">
<% @tags.each do |tag| -%>
- <%= link_to tag[I18n.locale], panel_archive_back_end_archive_files_path(:filter => @filter, :new_filter => {:type => 'tags', :id => tag.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small js_history#{is_filter_active?('tags', tag.id)}" %>
+ <%= link_to tag.name, panel_archive_back_end_archive_files_path(:filter => @filter, :new_filter => {:type => 'tags', :id => tag.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small js_history#{is_filter_active?('tags', tag.id)}" %>
<% end -%>
</div>
<%= render :partial => 'clear_filters', :locals => {:type => 'tags'} %>
\ No newline at end of file
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 7eba530..09cc2ac 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
@@ -28,7 +28,7 @@
<div class="widget-content clear form-horizontal">
<% @tags.each do |tag| %>
<%= check_box_tag 'archive_file[tag_ids][]', tag.id, @archive_file.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<% end %>
</div>
</div>
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/widget/archive_files/_tag.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/widget/archive_files/_tag.html.erb
index b8d32dc..6188bfe 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/widget/archive_files/_tag.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/widget/archive_files/_tag.html.erb
@@ -1,3 +1,3 @@
<li>
- <%= link_to tag[I18n.locale], panel_announcement_widget_bulletins_and_web_links_path(:id => tag.id), :remote => true, :class => ('active' if tag.eql?(@selected_tag)) %>
+ <%= link_to tag.name, panel_announcement_widget_bulletins_and_web_links_path(:id => tag.id), :remote => true, :class => ('active' if tag.eql?(@selected_tag)) %>
</li>
\ No newline at end of file
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/widget/archive_files/bulletins_list.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/widget/archive_files/bulletins_list.html.erb
index 2d3f198..a07d112 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/widget/archive_files/bulletins_list.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/widget/archive_files/bulletins_list.html.erb
@@ -5,7 +5,7 @@
<div class="tag_block">
<ul class="tag_list">
<% @tags.each do |tag| %>
- <li><%= tag[I18n.locale] %></li>
+ <li><%= tag.name %></li>
<% end %>
</ul>
</div>
diff --git a/vendor/built_in_modules/archive/init.rb b/vendor/built_in_modules/archive/init.rb
index 5814e1f..c12fbbd 100644
--- a/vendor/built_in_modules/archive/init.rb
+++ b/vendor/built_in_modules/archive/init.rb
@@ -66,7 +66,7 @@ module Archive
:available_for => [:manager]
context_link 'tags',
- :link_path=>"panel_archive_back_end_tags_path" ,
+ :link_path=>"admin_tags_path(:module_app_id => ModuleApp.first(conditions: {title: 'Archive'}))" ,
:priority=>4,
# :active_for_action=>{:bulletin_categorys=>:index},
:available_for => [:admin]
diff --git a/vendor/built_in_modules/calendar/app/models/cal.rb b/vendor/built_in_modules/calendar/app/models/cal.rb
index a1e8c6a..b338b0e 100644
--- a/vendor/built_in_modules/calendar/app/models/cal.rb
+++ b/vendor/built_in_modules/calendar/app/models/cal.rb
@@ -2,6 +2,9 @@ class Cal
include Mongoid::Document
include Mongoid::Timestamps
+ include OrbitTag::Taggable
+ taggable
+
field :name, localize: true
field :color
has_many :events, :autosave => true, :dependent => :destroy
diff --git a/vendor/built_in_modules/calendar/init.rb b/vendor/built_in_modules/calendar/init.rb
index 909774b..ea2070c 100644
--- a/vendor/built_in_modules/calendar/init.rb
+++ b/vendor/built_in_modules/calendar/init.rb
@@ -25,7 +25,7 @@ module Calendar
:available_for => [:manager]
context_link 'tags',
- :link_path=>"panel_calendar_back_end_tags_path" ,
+ :link_path=>"admin_tags_path(:module_app_id => ModuleApp.first(conditions: {title: 'Calendar'}))" ,
:priority=>4,
# :active_for_action=>{:bulletin_categorys=>:index},
:available_for => [:manager]
diff --git a/vendor/built_in_modules/faq/app/controllers/panel/faq/back_end/qas_controller.rb b/vendor/built_in_modules/faq/app/controllers/panel/faq/back_end/qas_controller.rb
index 484c119..8cf359a 100644
--- a/vendor/built_in_modules/faq/app/controllers/panel/faq/back_end/qas_controller.rb
+++ b/vendor/built_in_modules/faq/app/controllers/panel/faq/back_end/qas_controller.rb
@@ -37,7 +37,7 @@ class Panel::Faq::BackEnd::QasController < OrbitBackendController
#@qas = (params[:sort] || @filter) ? get_sorted_and_filtered_qas : Qa.all.page(params[:page]).per(10)
@qas = (params[:sort] || @filter) ? get_sorted_and_filtered("qa",:qa_category_id.in => @qa_category_ids) : get_viewable("qa",:qa_category_id.in => @qa_category_ids)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -60,7 +60,7 @@ class Panel::Faq::BackEnd::QasController < OrbitBackendController
# GET /qas/new.xml
def new
@qa = Qa.new
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -71,14 +71,14 @@ class Panel::Faq::BackEnd::QasController < OrbitBackendController
# GET /qas/1/edit
def edit
@qa = Qa.find(params[:id])
- get_tags
+ @tags = get_tags
end
# POST /qas
# POST /qas.xml
def create
@qa = Qa.new(params[:qa])
- get_tags
+ @tags = get_tags
@qa.create_user_id = current_user.id
@qa.update_user_id = current_user.id
@@ -134,11 +134,4 @@ class Panel::Faq::BackEnd::QasController < OrbitBackendController
redirect_to panel_faq_back_end_qas_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
end
- protected
-
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'faq'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id}) rescue []
- end
-
end
diff --git a/vendor/built_in_modules/faq/app/models/qa.rb b/vendor/built_in_modules/faq/app/models/qa.rb
index 81ce4af..6ba8bb5 100644
--- a/vendor/built_in_modules/faq/app/models/qa.rb
+++ b/vendor/built_in_modules/faq/app/models/qa.rb
@@ -4,13 +4,16 @@ class Qa
include Mongoid::Document
include Mongoid::Timestamps
include Mongoid::MultiParameterAttributes
+
+ include OrbitTag::Taggable
+ taggable
scope :available_for_lang, ->(locale){ where("available_for_#{locale}".to_sym => true) }
field :question, localize: true
field :answer, localize: true
- has_and_belongs_to_many :tags, :class_name => "FaqTag"
+ # has_and_belongs_to_many :tags, :class_name => "FaqTag"
field :create_user_id
diff --git a/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_filter_tags.html.erb b/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_filter_tags.html.erb
index 63d9fd6..02e348a 100644
--- a/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_filter_tags.html.erb
+++ b/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_filter_tags.html.erb
@@ -1,6 +1,6 @@
<div class="accordion-inner" data-toggle="buttons-checkbox">
<% @tags.each do |tag| -%>
- <%= link_to tag[I18n.locale], panel_faq_back_end_qas_path(:filter => @filter, :new_filter => {:type => 'tags', :id => tag.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small js_history#{is_filter_active?('tags', tag.id)}" %>
+ <%= link_to tag.name, panel_faq_back_end_qas_path(:filter => @filter, :new_filter => {:type => 'tags', :id => tag.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small js_history#{is_filter_active?('tags', tag.id)}" %>
<% end -%>
</div>
<%= render :partial => 'clear_filters', :locals => {:type => 'tags'} %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form.html.erb b/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form.html.erb
index 0621c8b..5b8e450 100644
--- a/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form.html.erb
+++ b/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form.html.erb
@@ -39,7 +39,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'qa[tag_ids][]', tag.id, @qa.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'qa[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_qa.html.erb b/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_qa.html.erb
index 158b2b8..c350d1d 100644
--- a/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_qa.html.erb
+++ b/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_qa.html.erb
@@ -35,7 +35,7 @@
<div class="label-group">
<div class="label-td">
<% qa.sorted_tags.each do |tag| %>
- <span class="label label-tags"><%= tag[I18n.locale] %></span>
+ <span class="label label-tags"><%= tag.name %></span>
<% end %>
</div>
</div>
diff --git a/vendor/built_in_modules/faq/init.rb b/vendor/built_in_modules/faq/init.rb
index 0982f4c..f2d5144 100644
--- a/vendor/built_in_modules/faq/init.rb
+++ b/vendor/built_in_modules/faq/init.rb
@@ -64,7 +64,7 @@ module Faq
:available_for => [:manager]
context_link 'tags',
- :link_path=>"panel_faq_back_end_tags_path" ,
+ :link_path=>"admin_tags_path(:module_app_id => ModuleApp.first(conditions: {title: 'Faq'}))" ,
:priority=>4,
# :active_for_action=>{:bulletin_categorys=>:index},
:available_for => [:manager]
diff --git a/vendor/built_in_modules/gallery/app/models/gallery_album.rb b/vendor/built_in_modules/gallery/app/models/gallery_album.rb
index 0a7f6b9..4df8cfa 100644
--- a/vendor/built_in_modules/gallery/app/models/gallery_album.rb
+++ b/vendor/built_in_modules/gallery/app/models/gallery_album.rb
@@ -2,6 +2,9 @@ class GalleryAlbum
include Mongoid::Document
include Mongoid::Timestamps
+ include OrbitTag::Taggable
+ taggable
+
field :name, localize: true
field :description, localize: true
field :cover, default: "default"
@@ -9,7 +12,7 @@ class GalleryAlbum
field :tag_names
belongs_to :gallery_category
- has_and_belongs_to_many :tags, :class_name => "GalleryTag"
+ # has_and_belongs_to_many :tags, :class_name => "GalleryTag"
has_many :gallery_images, :autosave => true, :dependent => :destroy
accepts_nested_attributes_for :gallery_images, :allow_destroy => true
diff --git a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/album_images/show.html.erb b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/album_images/show.html.erb
index b775405..f72a28b 100644
--- a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/album_images/show.html.erb
+++ b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/album_images/show.html.erb
@@ -53,7 +53,7 @@
<ul class="tag_list" id="gallery_tag_list">
<%# if @authenticated %>
<% @tags.each do |tag| %>
- <li data-content="<%= tag.id %>"><input id="tag_<%= tag.id %>" type="checkbox"><label for="tag_<%= tag.id %>"><%= tag[I18n.locale] %></label><span style="display:none;"><%= tag[@locales[1]] %> <%= tag[@locales[0]] %></span></li>
+ <li data-content="<%= tag.id %>"><input id="tag_<%= tag.id %>" type="checkbox"><label for="tag_<%= tag.id %>"><%= tag.name %></label><span style="display:none;"><%= tag[@locales[1]] %> <%= tag[@locales[0]] %></span></li>
<% end %>
<%# end %>
</ul>
diff --git a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/edit.html.erb b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/edit.html.erb
index 855c4a6..31346bc 100644
--- a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/edit.html.erb
+++ b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/edit.html.erb
@@ -98,7 +98,7 @@
<div class="overview">
<ul class="tag_list" id="gallery_tag_list">
<% @tags.each do |tag| %>
- <li data-content="<%= tag.id %>"><input id="tag_<%= tag.id %>" type="checkbox"><label for="tag_<%= tag.id %>"><%= tag[I18n.locale] %></label><span style="display:none;"><%= tag[@locales[1]] %> <%= tag[@locales[0]] %></span></li>
+ <li data-content="<%= tag.id %>"><input id="tag_<%= tag.id %>" type="checkbox"><label for="tag_<%= tag.id %>"><%= tag.name %></label><span style="display:none;"><%= tag[@locales[1]] %> <%= tag[@locales[0]] %></span></li>
<% end %>
</ul>
</div>
diff --git a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/index.html.erb b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/index.html.erb
index f53ad5d..81028f5 100644
--- a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/index.html.erb
+++ b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/index.html.erb
@@ -27,7 +27,7 @@
<div class="accordion-body collapse" id="collapse-tags">
<div class="accordion-inner filter_btns tags" data-toggle="buttons-checkbox">
<% @tags.each do |tag| %>
- <a href="tag=<%= tag.id %>" class="btn" onclick="return false;"><%= tag[I18n.locale] %></a>
+ <a href="tag=<%= tag.id %>" class="btn" onclick="return false;"><%= tag.name %></a>
<% end %>
</div>
<div class="filter-clear">
diff --git a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/show.html.erb b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/show.html.erb
index 8e91a03..cfdb8a7 100644
--- a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/show.html.erb
+++ b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/show.html.erb
@@ -29,7 +29,7 @@
<div class="overview">
<ul class="tag_list" id="gallery_tag_list">
<% @tags.each do |tag| %>
- <li data-content="<%= tag.id %>"><input id="tag_<%= tag.id %>" type="checkbox"><label for="tag_<%= tag.id %>"><%= tag[I18n.locale] %></label><span style="display:none;"><%= tag[@locales[1]] %> <%= tag[@locales[0]] %></span></li>
+ <li data-content="<%= tag.id %>"><input id="tag_<%= tag.id %>" type="checkbox"><label for="tag_<%= tag.id %>"><%= tag.name %></label><span style="display:none;"><%= tag[@locales[1]] %> <%= tag[@locales[0]] %></span></li>
<% end %>
</ul>
</div>
diff --git a/vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/orbit_galleries/index.html.erb b/vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/orbit_galleries/index.html.erb
index 9a7aa97..ee64bda 100644
--- a/vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/orbit_galleries/index.html.erb
+++ b/vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/orbit_galleries/index.html.erb
@@ -33,7 +33,7 @@
<div class="overview">
<ul class="tag_list" id="gallery_tag_list">
<% @tags.each do |tag| %>
- <li data-content="<%= tag.id %>"><input id="tag_<%= tag.id %>" type="checkbox"><label for="tag_<%= tag.id %>"><%= tag[I18n.locale] %></label><span style="display:none;"><%= tag[@locales[1]] %> <%= tag[@locales[0]] %></span></li>
+ <li data-content="<%= tag.id %>"><input id="tag_<%= tag.id %>" type="checkbox"><label for="tag_<%= tag.id %>"><%= tag.name %></label><span style="display:none;"><%= tag[@locales[1]] %> <%= tag[@locales[0]] %></span></li>
<% end %>
</ul>
</div>
diff --git a/vendor/built_in_modules/gallery/init.rb b/vendor/built_in_modules/gallery/init.rb
index 4046311..b136658 100644
--- a/vendor/built_in_modules/gallery/init.rb
+++ b/vendor/built_in_modules/gallery/init.rb
@@ -55,7 +55,7 @@ module Gallery
:available_for => [:manager]
context_link 'tags',
- :link_path=>"panel_gallery_back_end_tags_path" ,
+ :link_path=>"admin_tags_path(:module_app_id => ModuleApp.first(conditions: {title: 'Gallery'}))" ,
:priority=>4,
# :active_for_action=>{:bulletin_categorys=>:index},
:available_for => [:manager]
diff --git a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb
index 95dc499..2b61226 100644
--- a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb
+++ b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb
@@ -41,7 +41,7 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
@writing_books = (params[:sort] || @filter) ? get_sorted_and_filtered("writing_book",:book_paper_type_id.in => @paper_type_ids) : get_viewable("writing_book",:book_paper_type_id.in => @paper_type_ids)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -57,7 +57,7 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
@author_types = BookAuthorType.all
@paper_types = BookPaperType.all
- get_tags
+ @tags = get_tags
@set_author_type = BookAuthorType.new(:display => 'List')
@author_type_url = panel_personal_book_back_end_writing_books_path
@@ -132,7 +132,7 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
@author_types = BookAuthorType.all
@paper_types = BookPaperType.all
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -151,7 +151,7 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
@author_types = BookAuthorType.all
@paper_types = BookPaperType.all
- get_tags
+ @tags = get_tags
end
# POST /writing_books
@@ -184,7 +184,7 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
# @level_types = BookLevelType.all
@author_types = BookAuthorType.all
@paper_types = BookPaperType.all
- get_tags
+ @tags = get_tags
@writing_book = WritingBook.new(params[:writing_book])
@@ -316,9 +316,4 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
@plugins = OrbitApp::Plugin::Registration.all
end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_book'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/front_end/writing_books_controller.rb b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/front_end/writing_books_controller.rb
index ff8f70d..c5d3cf7 100644
--- a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/front_end/writing_books_controller.rb
+++ b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/front_end/writing_books_controller.rb
@@ -21,10 +21,4 @@ class Panel::PersonalBook::FrontEnd::WritingBooksController < OrbitWidgetControl
end
-
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_book'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/plugin/writing_books_controller.rb b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/plugin/writing_books_controller.rb
index 2dfd4d8..c763539 100644
--- a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/plugin/writing_books_controller.rb
+++ b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/plugin/writing_books_controller.rb
@@ -37,7 +37,7 @@ class Panel::PersonalBook::Plugin::WritingBooksController < OrbitBackendControll
#@writing_books = (params[:sort] || @filter) ? get_sorted_and_filtered_writing_books : WritingBook.all.page(params[:page]).per(10)
@writing_books = (params[:sort] || @filter) ? get_sorted_and_filtered("writing_book",:create_user_id => current_user.id) : get_viewable("writing_book", :create_user_id => current_user.id)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -66,7 +66,7 @@ class Panel::PersonalBook::Plugin::WritingBooksController < OrbitBackendControll
@author_types = BookAuthorType.all
@paper_types = BookPaperType.all
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -82,7 +82,7 @@ class Panel::PersonalBook::Plugin::WritingBooksController < OrbitBackendControll
@author_types = BookAuthorType.all
@paper_types = BookPaperType.all
- get_tags
+ @tags = get_tags
end
# POST /writing_books
@@ -92,7 +92,7 @@ class Panel::PersonalBook::Plugin::WritingBooksController < OrbitBackendControll
# @level_types = BookLevelType.all
@author_types = BookAuthorType.all
@paper_types = BookPaperType.all
- get_tags
+ @tags = get_tags
@writing_book = WritingBook.new(params[:writing_book])
@@ -178,9 +178,4 @@ class Panel::PersonalBook::Plugin::WritingBooksController < OrbitBackendControll
# end
# end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_book'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb
index 3b591b7..b825470 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb
@@ -32,7 +32,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'writing_book[tag_ids][]', tag.id, @writing_book.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'writing_book[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_form.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_form.html.erb
index afb1feb..49ab70f 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_form.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_form.html.erb
@@ -32,7 +32,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'writing_book[tag_ids][]', tag.id, @writing_book.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'writing_book[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conferences_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conferences_controller.rb
index 778b331..d5913db 100644
--- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conferences_controller.rb
+++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conferences_controller.rb
@@ -42,7 +42,7 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
@writing_conferences = (params[:sort] || @filter) ? get_sorted_and_filtered("writing_conference",:conference_paper_type_id.in => @paper_type_ids) : get_viewable("writing_conference",:conference_paper_type_id.in => @paper_type_ids)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -58,7 +58,7 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
@author_types = ConferenceAuthorType.all
@paper_types = ConferencePaperType.all
- get_tags
+ @tags = get_tags
@set_author_type = ConferenceAuthorType.new(:display => 'List')
@author_type_url = panel_personal_conference_back_end_writing_conferences_path
@@ -132,7 +132,7 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
# @paper_types = ConferenceLevelType.all
@author_types = ConferenceAuthorType.all
@paper_types = ConferencePaperType.all
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -151,7 +151,7 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
@author_types = ConferenceAuthorType.all
@paper_types = ConferencePaperType.all
- get_tags
+ @tags = get_tags
end
# POST /writing_conferences
@@ -183,7 +183,7 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
# @paper_types = ConferenceLevelType.all
@author_types = ConferenceAuthorType.all
@paper_types = ConferencePaperType.all
- get_tags
+ @tags = get_tags
@writing_conference = WritingConference.new(params[:writing_conference])
@@ -315,9 +315,4 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
@plugins = OrbitApp::Plugin::Registration.all
end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_conference'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/front_end/writing_seminars_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/front_end/writing_seminars_controller.rb
index dee56d6..cc41fc0 100644
--- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/front_end/writing_seminars_controller.rb
+++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/front_end/writing_seminars_controller.rb
@@ -23,9 +23,4 @@ class Panel::PersonalConference::FrontEnd::WritingConferencesController < OrbitW
end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_conference'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/plugin/writing_conferences_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/plugin/writing_conferences_controller.rb
index 2365283..873828f 100644
--- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/plugin/writing_conferences_controller.rb
+++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/plugin/writing_conferences_controller.rb
@@ -38,7 +38,7 @@ class Panel::PersonalConference::Plugin::WritingConferencesController < OrbitBac
#@writing_conferences = (params[:sort] || @filter) ? get_sorted_and_filtered_writing_conferences : WritingConference.all.page(params[:page]).per(10)
@writing_conferences = (params[:sort] || @filter) ? get_sorted_and_filtered("writing_conference",:create_user_id => current_user.id) : get_viewable("writing_conference", :create_user_id => current_user.id)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -67,7 +67,7 @@ class Panel::PersonalConference::Plugin::WritingConferencesController < OrbitBac
@author_types = ConferenceAuthorType.all
@paper_types = ConferencePaperType.all
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -83,7 +83,7 @@ class Panel::PersonalConference::Plugin::WritingConferencesController < OrbitBac
@author_types = ConferenceAuthorType.all
@paper_types = ConferencePaperType.all
- get_tags
+ @tags = get_tags
end
# POST /writing_conferences
@@ -93,7 +93,7 @@ class Panel::PersonalConference::Plugin::WritingConferencesController < OrbitBac
# @level_types = ConferenceLevelType.all
@author_types = ConferenceAuthorType.all
@paper_types = ConferencePaperType.all
- get_tags
+ @tags = get_tags
@writing_conference = WritingConference.new(params[:writing_conference])
@@ -179,9 +179,4 @@ class Panel::PersonalConference::Plugin::WritingConferencesController < OrbitBac
# end
# end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_conference'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form.html.erb
index 93ec5a0..5c6a31d 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form.html.erb
@@ -48,7 +48,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'writing_conference[tag_ids][]', tag.id, @writing_conference.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'writing_conference[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_form.html.erb
index 5304d12..02b0914 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_form.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_form.html.erb
@@ -48,7 +48,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'writing_conference[tag_ids][]', tag.id, @writing_conference.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'writing_conference[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/back_end/diplomas_controller.rb b/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/back_end/diplomas_controller.rb
index bd369ae..507f88b 100644
--- a/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/back_end/diplomas_controller.rb
+++ b/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/back_end/diplomas_controller.rb
@@ -31,7 +31,7 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll
@diplomas = (params[:sort] || @filter) ? get_sorted_and_filtered("diploma") : get_viewable("diploma")
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -44,7 +44,7 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll
get_plugins
- get_tags
+ @tags = get_tags
end
@@ -66,7 +66,7 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll
@diploma = Diploma.new
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -81,14 +81,14 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll
@diploma = Diploma.find(params[:id])
- get_tags
+ @tags = get_tags
end
# POST /diplomas
# POST /diplomas.xml
def create
- get_tags
+ @tags = get_tags
@diploma = Diploma.new(params[:diploma])
@@ -190,9 +190,4 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll
@plugins = OrbitApp::Plugin::Registration.all
end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_diploma'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/plugin/diplomas_controller.rb b/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/plugin/diplomas_controller.rb
index 695ad54..bcc3d68 100644
--- a/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/plugin/diplomas_controller.rb
+++ b/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/plugin/diplomas_controller.rb
@@ -27,7 +27,7 @@ class Panel::PersonalDiploma::Plugin::DiplomasController < OrbitBackendControlle
end
@diplomas = (params[:sort] || @filter) ? get_sorted_and_filtered("diploma",:create_user_id => current_user.id) : get_viewable("diploma", :create_user_id => current_user.id)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -38,7 +38,7 @@ class Panel::PersonalDiploma::Plugin::DiplomasController < OrbitBackendControlle
def diploma_setting
- get_tags
+ @tags = get_tags
end
@@ -58,7 +58,7 @@ class Panel::PersonalDiploma::Plugin::DiplomasController < OrbitBackendControlle
@diploma = Diploma.new
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -70,14 +70,14 @@ class Panel::PersonalDiploma::Plugin::DiplomasController < OrbitBackendControlle
def edit
@diploma = Diploma.find(params[:id])
- get_tags
+ @tags = get_tags
end
# POST /diplomas
# POST /diplomas.xml
def create
- get_tags
+ @tags = get_tags
@diploma = Diploma.new(params[:diploma])
@@ -164,9 +164,4 @@ class Panel::PersonalDiploma::Plugin::DiplomasController < OrbitBackendControlle
# end
# end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_diploma'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_form.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_form.html.erb
index 2828be1..4335e9c 100644
--- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_form.html.erb
+++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_form.html.erb
@@ -15,7 +15,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'diploma[tag_ids][]', tag.id, @diploma.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'diploma[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_form.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_form.html.erb
index ea7d965..8bd3ad1 100644
--- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_form.html.erb
+++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_form.html.erb
@@ -15,7 +15,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'diploma[tag_ids][]', tag.id, @diploma.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'diploma[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/experiences_controller.rb b/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/experiences_controller.rb
index 4d41d7b..322bc8f 100644
--- a/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/experiences_controller.rb
+++ b/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/experiences_controller.rb
@@ -38,7 +38,7 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo
@experiences = (params[:sort] || @filter) ? get_sorted_and_filtered("experience",:experience_category_id.in => @experience_category_ids) : get_viewable("experience",:experience_category_id.in => @experience_category_ids)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -53,7 +53,7 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo
@experience_types = ExperienceCategory.all
- get_tags
+ @tags = get_tags
@set_experience_type = ExperienceCategory.new(:display => 'List')
@experience_type_url = panel_personal_experience_back_end_experiences_path
@@ -101,7 +101,7 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo
@experience = Experience.new
@experience_categorys = ExperienceCategory.all
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -118,7 +118,7 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo
@experience_types = ExperienceCategory.all
- get_tags
+ @tags = get_tags
end
# POST /experiences
@@ -138,7 +138,7 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo
else
@experience_types = ExperienceCategory.all
- get_tags
+ @tags = get_tags
@experience = Experience.new(params[:experience])
@@ -258,9 +258,4 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo
@plugins = OrbitApp::Plugin::Registration.all
end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_experience'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/plugin/experiences_controller.rb b/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/plugin/experiences_controller.rb
index ae37e98..ecd658d 100644
--- a/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/plugin/experiences_controller.rb
+++ b/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/plugin/experiences_controller.rb
@@ -35,7 +35,7 @@ class Panel::PersonalExperience::Plugin::ExperiencesController < OrbitBackendCon
@experiences = (params[:sort] || @filter) ? get_sorted_and_filtered("experience",:create_user_id => current_user.id) : get_viewable("experience", :create_user_id => current_user.id)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -48,7 +48,7 @@ class Panel::PersonalExperience::Plugin::ExperiencesController < OrbitBackendCon
@experience_types = ExperienceCategory.all
- get_tags
+ @tags = get_tags
@set_experience_type = ExperienceCategory.new(:display => 'List')
@experience_type_url = panel_personal_experience_plugin_experiences_path
@@ -94,7 +94,7 @@ class Panel::PersonalExperience::Plugin::ExperiencesController < OrbitBackendCon
@experience = Experience.new
@experience_categorys = ExperienceCategory.all
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -108,7 +108,7 @@ class Panel::PersonalExperience::Plugin::ExperiencesController < OrbitBackendCon
@experience_types = ExperienceCategory.all
- get_tags
+ @tags = get_tags
end
# POST /experiences
@@ -128,7 +128,7 @@ class Panel::PersonalExperience::Plugin::ExperiencesController < OrbitBackendCon
else
@experience_types = ExperienceCategory.all
- get_tags
+ @tags = get_tags
@experience = Experience.new(params[:experience])
@@ -233,9 +233,4 @@ class Panel::PersonalExperience::Plugin::ExperiencesController < OrbitBackendCon
# end
# end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_experience'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_form.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_form.html.erb
index b790124..3f8ec02 100644
--- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_form.html.erb
+++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_form.html.erb
@@ -15,7 +15,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'experience[tag_ids][]', tag.id, @experience.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'experience[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/plugin/experiences/_form.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/plugin/experiences/_form.html.erb
index 90e0778..75901a6 100644
--- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/plugin/experiences/_form.html.erb
+++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/plugin/experiences/_form.html.erb
@@ -15,7 +15,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'experience[tag_ids][]', tag.id, @experience.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'experience[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/honors_controller.rb b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/honors_controller.rb
index a33b2ec..65412d3 100644
--- a/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/honors_controller.rb
+++ b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/honors_controller.rb
@@ -38,7 +38,7 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController
@honors = (params[:sort] || @filter) ? get_sorted_and_filtered("honor",:honor_category_id.in => @honor_category_ids) : get_viewable("honor",:honor_category_id.in => @honor_category_ids)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -53,7 +53,7 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController
@honor_types = HonorCategory.all
- get_tags
+ @tags = get_tags
@set_honor_type = HonorCategory.new(:display => 'List')
@honor_type_url = panel_personal_honor_back_end_honors_path
@@ -101,7 +101,7 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController
@honor = Honor.new
@honor_categorys = HonorCategory.all
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -118,7 +118,7 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController
@honor_types = HonorCategory.all
- get_tags
+ @tags = get_tags
end
# POST /honors
@@ -138,7 +138,7 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController
else
@honor_types = HonorCategory.all
- get_tags
+ @tags = get_tags
@honor = Honor.new(params[:honor])
@@ -261,9 +261,4 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController
@plugins = OrbitApp::Plugin::Registration.all
end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_honor'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/front_end/honors_controller.rb b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/front_end/honors_controller.rb
index 0668606..ad9b7f2 100644
--- a/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/front_end/honors_controller.rb
+++ b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/front_end/honors_controller.rb
@@ -20,9 +20,4 @@ class Panel::PersonalHonor::FrontEnd::HonorsController < OrbitWidgetController
end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_journal'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/plugin/honors_controller.rb b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/plugin/honors_controller.rb
index 1510fcf..474780f 100644
--- a/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/plugin/honors_controller.rb
+++ b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/plugin/honors_controller.rb
@@ -35,7 +35,7 @@ class Panel::PersonalHonor::Plugin::HonorsController < OrbitBackendController
@honors = (params[:sort] || @filter) ? get_sorted_and_filtered("honor",:create_user_id => current_user.id) : get_viewable("honor", :create_user_id => current_user.id)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -48,7 +48,7 @@ class Panel::PersonalHonor::Plugin::HonorsController < OrbitBackendController
@honor_types = HonorCategory.all
- get_tags
+ @tags = get_tags
@set_honor_type = HonorCategory.new(:display => 'List')
@honor_type_url = panel_personal_honor_plugin_honors_path
@@ -94,7 +94,7 @@ class Panel::PersonalHonor::Plugin::HonorsController < OrbitBackendController
@honor = Honor.new
@honor_categorys = HonorCategory.all
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -108,7 +108,7 @@ class Panel::PersonalHonor::Plugin::HonorsController < OrbitBackendController
@honor_types = HonorCategory.all
- get_tags
+ @tags = get_tags
end
# POST /honors
@@ -128,7 +128,7 @@ class Panel::PersonalHonor::Plugin::HonorsController < OrbitBackendController
else
@honor_types = HonorCategory.all
- get_tags
+ @tags = get_tags
@honor = Honor.new(params[:honor])
@@ -233,9 +233,4 @@ class Panel::PersonalHonor::Plugin::HonorsController < OrbitBackendController
# end
# end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_honor'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_form.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_form.html.erb
index 38ff35a..bdd67f9 100644
--- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_form.html.erb
+++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_form.html.erb
@@ -15,7 +15,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'honor[tag_ids][]', tag.id, @honor.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'honor[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/plugin/honors/_form.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/plugin/honors/_form.html.erb
index 58bdec3..2b45d06 100644
--- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/plugin/honors/_form.html.erb
+++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/plugin/honors/_form.html.erb
@@ -15,7 +15,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'honor[tag_ids][]', tag.id, @honor.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'honor[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/writing_journals_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/writing_journals_controller.rb
index 0a44652..072e6e9 100644
--- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/writing_journals_controller.rb
+++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/writing_journals_controller.rb
@@ -41,7 +41,7 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC
#@writing_journals = (params[:sort] || @filter) ? get_sorted_and_filtered_writing_journals : WritingJournal.all.page(params[:page]).per(10)
@writing_journals = (params[:sort] || @filter) ? get_sorted_and_filtered("writing_journal",:journal_paper_type_id.in => @paper_type_ids) : get_viewable("writing_journal",:journal_paper_type_id.in => @paper_type_ids)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -58,7 +58,7 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC
@author_types = JournalAuthorType.all
@paper_types = JournalPaperType.all
- get_tags
+ @tags = get_tags
# @writing_journal_categorys = JournalLevelType.all
@set_level_type = JournalLevelType.new(:display => 'List')
@@ -158,7 +158,7 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC
@author_types = JournalAuthorType.all
@paper_types = JournalPaperType.all
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -177,7 +177,7 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC
@author_types = JournalAuthorType.all
@paper_types = JournalPaperType.all
- get_tags
+ @tags = get_tags
end
# POST /writing_journals
@@ -220,7 +220,7 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC
@level_types = JournalLevelType.all
@author_types = JournalAuthorType.all
@paper_types = JournalPaperType.all
- get_tags
+ @tags = get_tags
@writing_journal = WritingJournal.new(params[:writing_journal])
@@ -366,9 +366,4 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC
@plugins = OrbitApp::Plugin::Registration.all
end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_journal'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/front_end/writing_journals_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/front_end/writing_journals_controller.rb
index 8b33907..1c006b4 100644
--- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/front_end/writing_journals_controller.rb
+++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/front_end/writing_journals_controller.rb
@@ -23,9 +23,4 @@ class Panel::PersonalJournal::FrontEnd::WritingJournalsController < OrbitWidgetC
end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_journal'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/plugin/writing_journals_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/plugin/writing_journals_controller.rb
index c772312..304c7ea 100644
--- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/plugin/writing_journals_controller.rb
+++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/plugin/writing_journals_controller.rb
@@ -38,7 +38,7 @@ class Panel::PersonalJournal::Plugin::WritingJournalsController < OrbitBackendCo
#@writing_journals = (params[:sort] || @filter) ? get_sorted_and_filtered_writing_journals : WritingJournal.all.page(params[:page]).per(10)
@writing_journals = (params[:sort] || @filter) ? get_sorted_and_filtered("writing_journal",:create_user_id => current_user.id) : get_viewable("writing_journal",:create_user_id => current_user.id)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -67,7 +67,7 @@ class Panel::PersonalJournal::Plugin::WritingJournalsController < OrbitBackendCo
@author_types = JournalAuthorType.all
@paper_types = JournalPaperType.all
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -83,7 +83,7 @@ class Panel::PersonalJournal::Plugin::WritingJournalsController < OrbitBackendCo
@author_types = JournalAuthorType.all
@paper_types = JournalPaperType.all
- get_tags
+ @tags = get_tags
end
# POST /writing_journals
@@ -93,7 +93,7 @@ class Panel::PersonalJournal::Plugin::WritingJournalsController < OrbitBackendCo
@level_types = JournalLevelType.all
@author_types = JournalAuthorType.all
@paper_types = JournalPaperType.all
- get_tags
+ @tags = get_tags
@writing_journal = WritingJournal.new(params[:writing_journal])
@@ -179,9 +179,4 @@ class Panel::PersonalJournal::Plugin::WritingJournalsController < OrbitBackendCo
# end
# end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_journal'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_filter_tags.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_filter_tags.html.erb
index 283a19f..863342a 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_filter_tags.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_filter_tags.html.erb
@@ -1,6 +1,6 @@
<div class="accordion-inner" data-toggle="buttons-checkbox">
<% @tags.each do |tag| -%>
- <%= link_to tag[I18n.locale], panel_personal_journal_back_end_writing_journals_path(:filter => @filter, :new_filter => {:type => 'tags', :id => tag.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('tags', tag.id)}" %>
+ <%= link_to tag.name, panel_personal_journal_back_end_writing_journals_path(:filter => @filter, :new_filter => {:type => 'tags', :id => tag.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('tags', tag.id)}" %>
<% end -%>
</div>
<%= render :partial => 'clear_filters', :locals => {:type => 'tags'} %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form.html.erb
index a232af2..24b63ca 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form.html.erb
@@ -36,7 +36,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'writing_journal[tag_ids][]', tag.id, @writing_journal.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'writing_journal[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/writing_journals/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/writing_journals/_form.html.erb
index fbe73bd..d8d2bae 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/writing_journals/_form.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/writing_journals/_form.html.erb
@@ -48,7 +48,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'writing_journal[tag_ids][]', tag.id, @writing_journal.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'writing_journal[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/back_end/labs_controller.rb b/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/back_end/labs_controller.rb
index 4d355c8..0fa938d 100644
--- a/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/back_end/labs_controller.rb
+++ b/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/back_end/labs_controller.rb
@@ -38,7 +38,7 @@ class Panel::PersonalLab::BackEnd::LabsController < OrbitBackendController
@labs = (params[:sort] || @filter) ? get_sorted_and_filtered("lab") : get_viewable("lab")
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -51,7 +51,7 @@ class Panel::PersonalLab::BackEnd::LabsController < OrbitBackendController
get_plugins
- get_tags
+ @tags = get_tags
end
@@ -73,7 +73,7 @@ class Panel::PersonalLab::BackEnd::LabsController < OrbitBackendController
@lab = Lab.new
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -88,14 +88,14 @@ class Panel::PersonalLab::BackEnd::LabsController < OrbitBackendController
@lab = Lab.find(params[:id])
- get_tags
+ @tags = get_tags
end
# POST /labs
# POST /labs.xml
def create
- get_tags
+ @tags = get_tags
@lab = Lab.new(params[:lab])
@@ -197,9 +197,4 @@ class Panel::PersonalLab::BackEnd::LabsController < OrbitBackendController
@plugins = OrbitApp::Plugin::Registration.all
end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_lab'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/plugin/labs_controller.rb b/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/plugin/labs_controller.rb
index 1a2f745..3b5e033 100644
--- a/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/plugin/labs_controller.rb
+++ b/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/plugin/labs_controller.rb
@@ -36,7 +36,7 @@ class Panel::PersonalLab::Plugin::LabsController < OrbitBackendController
@labs = (params[:sort] || @filter) ? get_sorted_and_filtered("lab",:create_user_id => current_user.id) : get_viewable("lab", :create_user_id => current_user.id)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -47,7 +47,7 @@ class Panel::PersonalLab::Plugin::LabsController < OrbitBackendController
def lab_setting
- get_tags
+ @tags = get_tags
end
@@ -67,7 +67,7 @@ class Panel::PersonalLab::Plugin::LabsController < OrbitBackendController
@lab = Lab.new
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -79,14 +79,14 @@ class Panel::PersonalLab::Plugin::LabsController < OrbitBackendController
def edit
@lab = Lab.find(params[:id])
- get_tags
+ @tags = get_tags
end
# POST /labs
# POST /labs.xml
def create
- get_tags
+ @tags = get_tags
@lab = Lab.new(params[:lab])
@@ -174,9 +174,4 @@ class Panel::PersonalLab::Plugin::LabsController < OrbitBackendController
# end
# end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_lab'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form.html.erb
index 39eb213..7495d74 100644
--- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form.html.erb
+++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form.html.erb
@@ -15,7 +15,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'lab[tag_ids][]', tag.id, @lab.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'lab[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/labs/_form.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/labs/_form.html.erb
index b48660f..552175e 100644
--- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/labs/_form.html.erb
+++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/labs/_form.html.erb
@@ -15,7 +15,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'lab[tag_ids][]', tag.id, @lab.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'lab[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/writing_patents_controller.rb b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/writing_patents_controller.rb
index 185a69d..10cc208 100644
--- a/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/writing_patents_controller.rb
+++ b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/writing_patents_controller.rb
@@ -38,7 +38,7 @@ class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendCon
@writing_patents = (params[:sort] || @filter) ? get_sorted_and_filtered("writing_patent",:writing_patent_category_id.in => @writing_patent_category_ids) : get_viewable("writing_patent",:writing_patent_category_id.in => @writing_patent_category_ids)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -53,7 +53,7 @@ class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendCon
@patent_types = WritingPatentCategory.all
- get_tags
+ @tags = get_tags
@set_patent_type = WritingPatentCategory.new(:display => 'List')
@patent_type_url = panel_personal_patent_back_end_writing_patents_path
@@ -101,7 +101,7 @@ class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendCon
@writing_patent = WritingPatent.new
@writing_patent_categorys = WritingPatentCategory.all
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -118,7 +118,7 @@ class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendCon
@patent_types = WritingPatentCategory.all
- get_tags
+ @tags = get_tags
end
# POST /writing_patents
@@ -138,7 +138,7 @@ class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendCon
else
@patent_types = WritingPatentCategory.all
- get_tags
+ @tags = get_tags
@writing_patent = WritingPatent.new(params[:writing_patent])
@@ -258,9 +258,4 @@ class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendCon
@plugins = OrbitApp::Plugin::Registration.all
end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_patent'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/front_end/writing_patents_controller.rb b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/front_end/writing_patents_controller.rb
index f734934..9d5f051 100644
--- a/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/front_end/writing_patents_controller.rb
+++ b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/front_end/writing_patents_controller.rb
@@ -21,9 +21,4 @@ class Panel::PersonalPatent::FrontEnd::WritingPatentsController < OrbitWidgetCon
end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_patent'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/plugin/writing_patents_controller.rb b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/plugin/writing_patents_controller.rb
index 1b2811e..bf9f428 100644
--- a/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/plugin/writing_patents_controller.rb
+++ b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/plugin/writing_patents_controller.rb
@@ -35,7 +35,7 @@ class Panel::PersonalPatent::Plugin::WritingPatentsController < OrbitBackendCont
@writing_patents = (params[:sort] || @filter) ? get_sorted_and_filtered("writing_patent",:create_user_id => current_user.id) : get_viewable("writing_patent", :create_user_id => current_user.id)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -62,7 +62,7 @@ class Panel::PersonalPatent::Plugin::WritingPatentsController < OrbitBackendCont
@writing_patent = WritingPatent.new
@writing_patent_categorys = WritingPatentCategory.all
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -76,7 +76,7 @@ class Panel::PersonalPatent::Plugin::WritingPatentsController < OrbitBackendCont
@patent_types = WritingPatentCategory.all
- get_tags
+ @tags = get_tags
end
# POST /writing_patents
@@ -84,7 +84,7 @@ class Panel::PersonalPatent::Plugin::WritingPatentsController < OrbitBackendCont
def create
@patent_types = WritingPatentCategory.all
- get_tags
+ @tags = get_tags
@writing_patent = WritingPatent.new(params[:writing_patent])
@@ -173,9 +173,4 @@ class Panel::PersonalPatent::Plugin::WritingPatentsController < OrbitBackendCont
# end
# end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_patent'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
index 197e574..9de98bd 100644
--- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
+++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
@@ -15,7 +15,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'writing_patent[tag_ids][]', tag.id, @writing_patent.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'writing_patent[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/writing_patents/_form.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
index e863ccc..f8e5ef5 100644
--- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
+++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
@@ -15,7 +15,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'writing_patent[tag_ids][]', tag.id, @writing_patent.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'writing_patent[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/projects_controller.rb b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/projects_controller.rb
index 82cf054..ff15382 100644
--- a/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/projects_controller.rb
+++ b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/projects_controller.rb
@@ -38,7 +38,7 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll
@projects = (params[:sort] || @filter) ? get_sorted_and_filtered("project",:project_category_id.in => @project_category_ids) : get_viewable("project",:project_category_id.in => @project_category_ids)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -53,7 +53,7 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll
@project_types = ProjectCategory.all
- get_tags
+ @tags = get_tags
@set_project_type = ProjectCategory.new(:display => 'List')
@project_type_url = panel_personal_project_back_end_projects_path
@@ -101,7 +101,7 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll
@project = Project.new
@project_categorys = ProjectCategory.all
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -118,7 +118,7 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll
@project_types = ProjectCategory.all
- get_tags
+ @tags = get_tags
end
# POST /projects
@@ -138,7 +138,7 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll
else
@project_types = ProjectCategory.all
- get_tags
+ @tags = get_tags
@project = Project.new(params[:project])
@@ -258,9 +258,4 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll
@plugins = OrbitApp::Plugin::Registration.all
end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_project'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/front_end/projects_controller.rb b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/front_end/projects_controller.rb
index 285222d..08a9f8d 100644
--- a/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/front_end/projects_controller.rb
+++ b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/front_end/projects_controller.rb
@@ -20,9 +20,4 @@ class Panel::PersonalProject::FrontEnd::ProjectsController < OrbitWidgetControll
end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_project'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/plugin/projects_controller.rb b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/plugin/projects_controller.rb
index d3501cf..514f901 100644
--- a/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/plugin/projects_controller.rb
+++ b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/plugin/projects_controller.rb
@@ -36,7 +36,7 @@ class Panel::PersonalProject::Plugin::ProjectsController < OrbitBackendControlle
@projects = (params[:sort] || @filter) ? get_sorted_and_filtered("project",:create_user_id => current_user.id) : get_viewable("project", :create_user_id => current_user.id)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -63,7 +63,7 @@ class Panel::PersonalProject::Plugin::ProjectsController < OrbitBackendControlle
@project_categorys = ProjectCategory.all
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -77,7 +77,7 @@ class Panel::PersonalProject::Plugin::ProjectsController < OrbitBackendControlle
@project_categorys = ProjectCategory.all
- get_tags
+ @tags = get_tags
end
# POST /projects
@@ -85,7 +85,7 @@ class Panel::PersonalProject::Plugin::ProjectsController < OrbitBackendControlle
def create
@project_categorys = ProjectCategory.all
- get_tags
+ @tags = get_tags
@project = Project.new(params[:project])
@@ -173,9 +173,4 @@ class Panel::PersonalProject::Plugin::ProjectsController < OrbitBackendControlle
# end
# end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_project'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form.html.erb
index 99ab2e3..43fce2e 100644
--- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form.html.erb
+++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form.html.erb
@@ -15,7 +15,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'project[tag_ids][]', tag.id, @project.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'project[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/projects/_form.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/projects/_form.html.erb
index cf75a1e..5dcc5d9 100644
--- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/projects/_form.html.erb
+++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/projects/_form.html.erb
@@ -15,7 +15,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'project[tag_ids][]', tag.id, @project.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'project[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/back_end/researchs_controller.rb b/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/back_end/researchs_controller.rb
index 31b60bc..5c432a5 100644
--- a/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/back_end/researchs_controller.rb
+++ b/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/back_end/researchs_controller.rb
@@ -30,7 +30,7 @@ class Panel::PersonalResearch::BackEnd::ResearchsController < OrbitBackendContro
# @researchs = (params[:sort] || @filter) ? get_sorted_and_filtered("research") : get_viewable("research",:journal_paper_type_id.in => @paper_type_ids)
@researchs = Research.all.page(params[:page]).per(10)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -57,7 +57,7 @@ class Panel::PersonalResearch::BackEnd::ResearchsController < OrbitBackendContro
@research = Research.new
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -72,14 +72,14 @@ class Panel::PersonalResearch::BackEnd::ResearchsController < OrbitBackendContro
@research = Research.find(params[:id])
- get_tags
+ @tags = get_tags
end
# POST /researchs
# POST /researchs.xml
def create
- get_tags
+ @tags = get_tags
@research = Research.new(params[:research])
@@ -182,9 +182,4 @@ class Panel::PersonalResearch::BackEnd::ResearchsController < OrbitBackendContro
@plugins = OrbitApp::Plugin::Registration.all
end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_research'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/front_end/researchs_controller.rb b/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/front_end/researchs_controller.rb
index 02e6b09..a726dee 100644
--- a/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/front_end/researchs_controller.rb
+++ b/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/front_end/researchs_controller.rb
@@ -17,11 +17,6 @@ class Panel::PersonalResearch::FrontEnd::ResearchsController < OrbitWidgetContro
def show
@research = Research.find(params[:id])
end
-
-
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_journal'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
+
end
diff --git a/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/plugin/researchs_controller.rb b/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/plugin/researchs_controller.rb
index a4945ab..35ba17a 100644
--- a/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/plugin/researchs_controller.rb
+++ b/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/plugin/researchs_controller.rb
@@ -29,7 +29,7 @@ class Panel::PersonalResearch::Plugin::ResearchsController < OrbitBackendControl
# @researchs = (params[:sort] || @filter) ? get_sorted_and_filtered("research",:create_user_id => current_user.id) : get_viewable("research",:create_user_id => current_user.id)
@researchs = @researchs = Research.all.where(:create_user_id => current_user.id).page(params[:page]).per(10)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -54,7 +54,7 @@ class Panel::PersonalResearch::Plugin::ResearchsController < OrbitBackendControl
@research = Research.new
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -66,14 +66,14 @@ class Panel::PersonalResearch::Plugin::ResearchsController < OrbitBackendControl
def edit
@research = Research.find(params[:id])
- get_tags
+ @tags = get_tags
end
# POST /researchs
# POST /researchs.xml
def create
- get_tags
+ @tags = get_tags
@research = Research.new(params[:research])
@@ -159,9 +159,4 @@ class Panel::PersonalResearch::Plugin::ResearchsController < OrbitBackendControl
# end
# end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'personal_research'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id})
- end
-
end
diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_filter_tags.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_filter_tags.html.erb
index 319ef6e..918793b 100644
--- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_filter_tags.html.erb
+++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_filter_tags.html.erb
@@ -1,6 +1,6 @@
<div class="accordion-inner" data-toggle="buttons-checkbox">
<% @tags.each do |tag| -%>
- <%= link_to tag[I18n.locale], panel_personal_research_back_end_researchs_path(:filter => @filter, :new_filter => {:type => 'tags', :id => tag.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('tags', tag.id)}" %>
+ <%= link_to tag.name, panel_personal_research_back_end_researchs_path(:filter => @filter, :new_filter => {:type => 'tags', :id => tag.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('tags', tag.id)}" %>
<% end -%>
</div>
<%= render :partial => 'clear_filters', :locals => {:type => 'tags'} %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form.html.erb
index e34dd05..44d5745 100644
--- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form.html.erb
+++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form.html.erb
@@ -15,7 +15,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'research[tag_ids][]', tag.id, @research.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'research[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/researchs/_form.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/researchs/_form.html.erb
index dff581f..2fd6fbe 100644
--- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/researchs/_form.html.erb
+++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/researchs/_form.html.erb
@@ -15,7 +15,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'research[tag_ids][]', tag.id, @research.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'research[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
index 8873088..0f44cff 100644
--- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
+++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
@@ -36,7 +36,7 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController
#@web_links = (params[:sort] || @filter) ? get_sorted_and_filtered_web_links : WebLink.all.page(params[:page]).per(10)
@web_links = (params[:sort] || @filter) ? get_sorted_and_filtered("web_link",:web_link_category_id.in => @web_link_category_ids) : get_viewable("web_link",:web_link_category_id.in => @web_link_category_ids)
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # index.html.erb
@@ -59,7 +59,7 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController
# GET /web_links/new.xml
def new
@web_link = WebLink.new
- get_tags
+ @tags = get_tags
respond_to do |format|
format.html # new.html.erb
@@ -70,14 +70,14 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController
# GET /web_links/1/edit
def edit
@web_link = WebLink.find(params[:id])
- get_tags
+ @tags = get_tags
end
# POST /web_links
# POST /web_links.xml
def create
@web_link = WebLink.new(params[:web_link])
- get_tags
+ @tags = get_tags
@web_link.create_user_id = current_user.id
@web_link.update_user_id = current_user.id
@@ -160,9 +160,4 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController
# end
# end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'web_resource'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id}) rescue []
- end
-
end
diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
index deb9d0c..4486f04 100644
--- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
+++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
@@ -50,9 +50,4 @@ class Panel::WebResource::Widget::WebLinksController < OrbitWidgetController
@web_link_categorys = WebLinkCategory.all
end
- def get_tags
- module_app = ModuleApp.first(:conditions => {:key => 'web_resource'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id}) rescue []
- end
-
end
diff --git a/vendor/built_in_modules/web_resource/app/models/web_link.rb b/vendor/built_in_modules/web_resource/app/models/web_link.rb
index 68b94cf..64e448c 100644
--- a/vendor/built_in_modules/web_resource/app/models/web_link.rb
+++ b/vendor/built_in_modules/web_resource/app/models/web_link.rb
@@ -4,13 +4,16 @@ class WebLink
include Mongoid::Document
include Mongoid::Timestamps
include Mongoid::MultiParameterAttributes
+
+ include OrbitTag::Taggable
+ taggable
scope :available_for_lang, ->(locale){ where("available_for_#{locale}".to_sym => true) }
field :title, localize: true
field :context, localize: true
- has_and_belongs_to_many :tags, :class_name => "WebResourceTag"
+ # has_and_belongs_to_many :tags, :class_name => "WebResourceTag"
field :url
field :create_user_id
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb
index fbef195..8194b1a 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb
@@ -39,7 +39,7 @@
<% @tags.each do |tag| %>
<%= content_tag :label,:class => "checkbox inline" do -%>
<%= check_box_tag 'web_link[tag_ids][]', tag.id, @web_link.tag_ids.include?(tag.id)%>
- <%= tag[I18n.locale] %>
+ <%= tag.name %>
<%= hidden_field_tag 'web_link[tag_ids][]', '' %>
<% end %>
<% end %>
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb
index 7032d76..4b11686 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb
@@ -35,7 +35,7 @@
<div class="label-group">
<div class="label-td">
<% web_link.sorted_tags.each do |tag| %>
- <span class="label label-tags"><%= tag[I18n.locale] %></span>
+ <span class="label label-tags"><%= tag.name %></span>
<% end %>
</div>
</div>
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_index.html.erb
index 5431137..39667f8 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_index.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_index.html.erb
@@ -1,7 +1,7 @@
<% if @current_category %>
<h1 class="h1"><%= @current_category.title + " " + t(:list_lower) %></h1>
<% elsif @tag %>
- <h1 class="h1"><%= @tag[I18n.locale] + " " + t(:list_lower) %></h1>
+ <h1 class="h1"><%= @tag.name + " " + t(:list_lower) %></h1>
<% else %>
<h1 class="h1"><%= t('list.link') %></h1>
<% end %>
diff --git a/vendor/built_in_modules/web_resource/init.rb b/vendor/built_in_modules/web_resource/init.rb
index 4827211..2ba99e7 100644
--- a/vendor/built_in_modules/web_resource/init.rb
+++ b/vendor/built_in_modules/web_resource/init.rb
@@ -53,7 +53,7 @@ module WebResource
:available_for => [:manager]
context_link 'tags',
- :link_path=>"panel_web_resource_back_end_tags_path" ,
+ :link_path=>"admin_tags_path(:module_app_id => ModuleApp.first(conditions: {title: 'WebResource'}))" ,
:priority=>4,
# :active_for_action=>{:bulletin_categorys=>:index},
:available_for => [:manager]
--
1.8.1
From 828b52c19927d5d8c79391a2457b87ac915039a3 Mon Sep 17 00:00:00 2001
From: chris <chris.vilayphiou@gmail.com>
Date: Mon, 22 Apr 2013 19:44:46 +0800
Subject: [PATCH] Fix missing values in tag form when editing
---
app/views/admin/tags/_form.html.erb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/views/admin/tags/_form.html.erb b/app/views/admin/tags/_form.html.erb
index 9628e01..5715b8d 100644
--- a/app/views/admin/tags/_form.html.erb
+++ b/app/views/admin/tags/_form.html.erb
@@ -1,7 +1,7 @@
<%= form_for :tag, :url => admin_tag_path(tag), :method => :put, :remote => true do |f| %>
<%= f.fields_for :name_translations do |f| %>
<% @site_valid_locales.each do |locale| %>
- <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale %>
+ <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale, value: @tag.name_translations[locale] %>
<% end %>
<% end %>
<%= hidden_field_tag :module_app_id, @module_app_id %>
--
1.8.1
Reference in New Issue View Git Blame Copy Permalink