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

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

Conflicts:
	app/views/layouts/module_widget.html.erb
This commit is contained in:
unknown 2012-02-20 16:25:29 +08:00
parent e82fd405c9 1146506063
commit b0834c0c62
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/layouts/module_widget.html.erb
View File

@ -4,7 +4,7 @@
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]--> <![endif]-->
<%#= stylesheet_link_tag "widget" %> <%#= stylesheet_link_tag "module_widget" %>
<%= javascript_include_tag "module_widget" %> <%= javascript_include_tag "module_widget" %>
<%= csrf_meta_tag %> <%= csrf_meta_tag %>
</head> </head>

6
vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb vendored
View File

@ -22,18 +22,18 @@ class Panel::Announcement::Widget::BulletinsController < ObitWidgetController
def bulletins_and_web_links def bulletins_and_web_links
@tags = AnnouncementTag.all @tags = AnnouncementTag.all
@selected_tag = AnnouncementTag.find(params[:id]) rescue @tags[0] @selected_tag = AnnouncementTag.find(params[:id]) rescue @tags[0]
@bulletins = @selected_tag.get_visible_bulletins.page(params[:page]).per(1) rescue nil @bulletins = @selected_tag.get_visible_bulletins.page(params[:page]).per(5) rescue nil
@web_links = WebResourceTag.first(:conditions => {:en => @selected_tag[:en]}).get_visible_links.page(params[:page]).per(1) rescue nil @web_links = WebResourceTag.first(:conditions => {:en => @selected_tag[:en]}).get_visible_links.page(params[:page]).per(1) rescue nil
end end
def reload_bulletins def reload_bulletins
@selected_tag = AnnouncementTag.find(params[:tag_id]) @selected_tag = AnnouncementTag.find(params[:tag_id])
@bulletins = @selected_tag.get_visible_bulletins.page(params[:page]).per(1) rescue nil @bulletins = @selected_tag.get_visible_bulletins.page(params[:page]).per(5) rescue nil
end end
def reload_web_links def reload_web_links
@selected_tag = AnnouncementTag.find(params[:tag_id]) @selected_tag = AnnouncementTag.find(params[:tag_id])
@web_links = WebResourceTag.first(:conditions => {:en => @selected_tag[:en]}).get_visible_links.page(params[:page]).per(1) rescue nil @web_links = WebResourceTag.first(:conditions => {:en => @selected_tag[:en]}).get_visible_links.page(params[:page]).per(5) rescue nil
end end

2
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/reload_bulletins.js.erb vendored
View File

@ -1 +1 @@
$('#bulletins_web_links_bulletins').html("<%= j render 'bulletins' %>") $('#bulletins_web_links_bulletins').html("<%= j render 'bulletins' if @bulletins %>")

2
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/reload_web_links.js.erb vendored
View File

@ -1 +1 @@
$('#bulletins_web_links_web_links').html("<%= j render 'web_links' %>") $('#bulletins_web_links_web_links').html("<%= j render 'web_links' id @web_links %>")