member plugin init edit
This commit is contained in:
commit
680d7908b9
234 files changed
+2085
-3308
No files matched your search
+1
-1
@@ -286,7 +286,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
|
||||
|
||||
def delete
|
||||
if params[:ids]
|
||||
bulletins = Bulletin.any_in(:_id => params[:ids]).delete_all
|
||||
bulletins = Bulletin.any_in(:_id => params[:ids]).destroy_all
|
||||
end
|
||||
redirect_to panel_announcement_back_end_bulletins_url(:filter => params[:filter], :direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
|
||||
end
|
||||
|
||||
@@ -12,7 +12,7 @@ class BulletinLink
|
||||
belongs_to :bulletin
|
||||
|
||||
before_validation :add_http
|
||||
validates :url, :presence => true, :format => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix
|
||||
validates :url, :presence => true, :format => /^(http|https):\/\/(([a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5})|((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))(:[0-9]{1,5})?(\/.*)?/i
|
||||
|
||||
protected
|
||||
|
||||
|
||||
+14
-1
@@ -16,4 +16,17 @@ en:
|
||||
update_bulletin_success: Announcement was successfully updated
|
||||
update_bulletin_category_success: Announcement category was successfully updated
|
||||
all_articles: All Articles
|
||||
add_new: New
|
||||
add_new: New
|
||||
widget:
|
||||
index: Index widget
|
||||
bulletins_and_web_links: "Abreast of bulletins and web link"
|
||||
#init don't merge
|
||||
all_articles: "All article"
|
||||
add_new: New
|
||||
categories: Categories
|
||||
approval_setting: "Approval setting"
|
||||
tags: Tag
|
||||
default_widget:
|
||||
bulletin_category_with_title: Category
|
||||
title: Title
|
||||
postdate: "Post date"
|
||||
Reference in new issue
Block a user