developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard

Browse Source 
Conflicts:
	app/assets/javascripts/bulletin_form.js.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
	vendor/built_in_modules/announcement/config/routes.rb
This commit is contained in:
Christophe Vilayphiou committed 2012-03-27 18:37:14 +08:00
2 parents 33955b4554 e8d1352890
commit f9c5ee5d18
2 files changed
+15 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/assets/javascripts/bulletin_form.js.erb
+2 -4
View File
@@ -1,11 +1,9 @@
$('.bulletin_links_block a.delete').live('click', function(){
//$(this).parents('.list_item').remove();
$(this).parents('tr.list_item').remove();
$(this).parents('.list_item').remove();
});
$('.bulletin_files_block a.delete').live('click', function(){
//$(this).parents('.list_item').remove();
$(this).parents('tr.list_item').remove();
$(this).parents('.list_item').remove();
});
$('.action a.remove_existing_record').live('click', function(){