Add tagged_ids to taggable
This commit is contained in:
1 parent
167a71272a
commit
aefd62da2a
3 files changed
+36
-18
No files matched your search
@@ -11,7 +11,7 @@ class Admin::AssetsController < OrbitBackendController
|
||||
def new
|
||||
@asset = Asset.new
|
||||
@asset_categories = AssetCategory.all
|
||||
@tags = AssetTag.all
|
||||
@tags = get_tags
|
||||
respond_to do |format|
|
||||
format.html {}
|
||||
format.js { render 'js/show_pop_up', :locals => {:partial => 'admin/assets/new'} }
|
||||
@@ -21,7 +21,7 @@ class Admin::AssetsController < OrbitBackendController
|
||||
def edit
|
||||
@asset = Asset.find(params[:id])
|
||||
@asset_categories = AssetCategory.all
|
||||
@tags = AssetTag.all
|
||||
@tags = get_tags
|
||||
respond_to do |format|
|
||||
format.html {}
|
||||
format.js { render 'js/show_pop_up', :locals => {:partial => 'admin/assets/edit'} }
|
||||
@@ -46,7 +46,7 @@ class Admin::AssetsController < OrbitBackendController
|
||||
else
|
||||
flash[:error] = t('create.fail')
|
||||
@asset_categories = AssetCategory.all
|
||||
@tags = AssetTag.all
|
||||
@tags = get_tags
|
||||
respond_to do |format|
|
||||
format.js {
|
||||
if params[:uploader]
|
||||
@@ -69,7 +69,7 @@ class Admin::AssetsController < OrbitBackendController
|
||||
else
|
||||
flash[:error] = t('update.fail')
|
||||
@asset_categories = AssetCategory.all
|
||||
@tags = AssetTag.all
|
||||
@tags = get_tags
|
||||
respond_to do |format|
|
||||
format.html { render :action => :edit }
|
||||
format.js { render 'js/reload_pop_up', :locals => {:value => @asset, :values => nil, :partial => 'admin/assets/edit', :locals => {:is_html => false}} }
|
||||
@@ -96,7 +96,7 @@ class Admin::AssetsController < OrbitBackendController
|
||||
def file_upload
|
||||
@asset = Asset.new
|
||||
@asset_categories = AssetCategory.all
|
||||
@tags = AssetTag.all
|
||||
@tags = get_tags
|
||||
render :layout => false
|
||||
end
|
||||
|
||||
|
||||
Reference in new issue
Block a user