Fix relations error in tags

app/controllers/admin/tags_controller.rb

@@ -19,7 +19,7 @@ class Admin::TagsController < ApplicationController
   end
 
   def create
-    @tag = Tag.create(params[:tag])
+    @tag = (params[:tag][:module_app_id].blank? ? Tag.create(params[:tag]) : ModuleAppTag.create(params[:tag]))
   end
 
   def update

app/models/i18n_variable.rb

@@ -21,8 +21,4 @@ class I18nVariable
     I18nVariable.first(:conditions => {:key => locale})[I18n.locale]
   end
   
-  def self.from_locale(locale)
-    I18nVariable.first(:conditions => {:key => locale})[I18n.locale]
-  end
-  
 end

app/models/tag.rb

@@ -4,6 +4,5 @@ class Tag
   include Mongoid::Timestamps
   
   belongs_to :module_app
-  has_and_belongs_to_many :bulletins
   
 end

app/views/admin/tags/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for tag, :url => admin_tag_path(tag), :remote => true do |f| %>
+<%= 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 %>

vendor/built_in_modules/announcement/app/models/bulletin.rb

@@ -8,7 +8,7 @@ class Bulletin
   has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
   has_one :subtitle, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
   has_one :text, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
-  has_and_belongs_to_many :tags
+  has_and_belongs_to_many :tags, :class_name => "ModuleAppTag"
 
   field :postdate , :type => Date
   field :deadline , :type => Date

vendor/built_in_modules/announcement/app/models/module_app_tag.rb

@@ -0,0 +1,5 @@
+class ModuleAppTag < Tag
+  
+  has_and_belongs_to_many :bulletins
+  
+end