diff --git a/app/controllers/admins/system_notifications_controller.rb b/app/controllers/admins/system_notifications_controller.rb index 29109fd80..e2081f1a2 100644 --- a/app/controllers/admins/system_notifications_controller.rb +++ b/app/controllers/admins/system_notifications_controller.rb @@ -33,7 +33,6 @@ class Admins::SystemNotificationsController < Admins::BaseController end def update - respond_to do |format| if @notification.update_attributes(notification_params) format.html do diff --git a/app/models/system_notification.rb b/app/models/system_notification.rb index 11220dfc1..8eacd437c 100644 --- a/app/models/system_notification.rb +++ b/app/models/system_notification.rb @@ -5,7 +5,8 @@ # id :integer not null, primary key # subject :string(255) # sub_subject :string(255) -# content :string(255) +# content :text(65535) +# is_top :boolean # created_at :datetime not null # updated_at :datetime not null # diff --git a/app/views/admins/system_notifications/_form.html.erb b/app/views/admins/system_notifications/_form.html.erb index 8e7619101..33c35747a 100644 --- a/app/views/admins/system_notifications/_form.html.erb +++ b/app/views/admins/system_notifications/_form.html.erb @@ -1,6 +1,6 @@
-
<%= type == "create" ? "新建" : "编辑" %>忽略文件
- <%= link_to "返回", admins_project_ignores_path, class: "btn btn-default pull-right" %> +
<%= type == "create" ? "新建" : "编辑" %>系统通知
+ <%= link_to "返回", admins_system_notifications_path, class: "btn btn-default pull-right" %>
diff --git a/app/views/admins/system_notifications/edit.js.erb b/app/views/admins/system_notifications/edit.js.erb index 63fad5838..e5929f876 100644 --- a/app/views/admins/system_notifications/edit.js.erb +++ b/app/views/admins/system_notifications/edit.js.erb @@ -1,2 +1,2 @@ -$("#admins-system-notification-content").html("<%= j render(partial: 'admins/system_notifications/form', locals: {type: 'create'}) %>") +$("#admins-system-notification-content").html("<%= j render(partial: 'admins/system_notifications/form', locals: {type: 'update'}) %>") createMDEditor('system-notification-content-editor', { height: 500, placeholder: '请输入邮件模版' }); \ No newline at end of file diff --git a/db/migrate/20211013090556_change_system_notification_content_column.rb b/db/migrate/20211013090556_change_system_notification_content_column.rb new file mode 100644 index 000000000..1e0e80927 --- /dev/null +++ b/db/migrate/20211013090556_change_system_notification_content_column.rb @@ -0,0 +1,5 @@ +class ChangeSystemNotificationContentColumn < ActiveRecord::Migration[5.2] + def change + change_column :system_notifications, :content, :text + end +end