456
/
seminar2_old
forked from spen/seminar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master' 

Fix bug.



See merge request !16
This commit is contained in:
chiu 2021-07-02 17:34:47 +08:00
parent 008ba7aeda 0e6c8aa074
commit 0f7a77f3cc
2 changed files with 70 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
custom_announcement/app/views/custom_announcements/custom_widget_data.html.erb
View File

@ -1,6 +1,7 @@
<% active_module = @custom_data_field[:bind_module_app] rescue nil %> <% active_module = @custom_data_field[:bind_module_app] rescue nil %>
<% active_uid = @custom_data_field[:bind_uid] rescue nil %> <% active_uid = @custom_data_field[:bind_uid] rescue nil %>
<% active_module = @custom_configs.first.module if active_module.nil? %> <% active_module = @custom_configs.first.module rescue nil if active_module.nil? %>
<% if @custom_configs.length != 0 %>
<div class="control-group input-content"> <div class="control-group input-content">
<label class="control-label muted" for="custom_bind_module_app"><%=t("custom_announcement.use_module")%> :</label> <label class="control-label muted" for="custom_bind_module_app"><%=t("custom_announcement.use_module")%> :</label>
<div class="controls"> <div class="controls">
@ -37,3 +38,4 @@
} }
}) })
</script> </script>
<% end %>

4
custom_gallery/app/views/custom_galleries/custom_widget_data.html.erb
View File

@ -1,6 +1,7 @@
<% active_module = @custom_data_field[:bind_module_app] rescue nil %> <% active_module = @custom_data_field[:bind_module_app] rescue nil %>
<% active_uid = @custom_data_field[:bind_uid] rescue nil %> <% active_uid = @custom_data_field[:bind_uid] rescue nil %>
<% active_module = @custom_configs.first.module if active_module.nil? %> <% active_module = @custom_configs.first.module rescue nil if active_module.nil? %>
<% if @custom_configs.length != 0%>
<div class="control-group input-content"> <div class="control-group input-content">
<label class="control-label muted" for="custom_bind_module_app"><%=t("custom_gallery.use_module")%> :</label> <label class="control-label muted" for="custom_bind_module_app"><%=t("custom_gallery.use_module")%> :</label>
<div class="controls"> <div class="controls">
@ -37,3 +38,4 @@
} }
}) })
</script> </script>
<% end %>