mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-20 14:45:56 +08:00
Merge branch 'lm-sci-1091-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-1091-fix
Conflicts: app/views/my_modules/_state_buttons.html.erb
This commit is contained in:
commit
0e8f5f8e99
|
@ -1,14 +1,16 @@
|
|||
<div class="pull-right my_module-state-buttons">
|
||||
<div class="btn-group">
|
||||
<% if !@my_module.completed? %>
|
||||
<div data-action="complete-task" data-link-url="<%= toggle_task_state_my_module_path(@my_module) %>">
|
||||
<%= render 'my_modules/state_button_complete.html.erb' %>
|
||||
</div>
|
||||
<% else @my_module.completed? %>
|
||||
<div data-action="uncomplete-task" data-link-url="<%= toggle_task_state_my_module_path(@my_module) %>">
|
||||
<%= render 'my_modules/state_button_uncomplete.html.erb' %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
<% if can_complete_module(@my_module) %>
|
||||
<div class="btn-group">
|
||||
<% if !@my_module.completed? %>
|
||||
<div data-action="complete-task" data-link-url="<%= toggle_task_state_my_module_path(@my_module) %>">
|
||||
<%= render 'my_modules/state_button_complete.html.erb' %>
|
||||
</div>
|
||||
<% else @my_module.completed? %>
|
||||
<div data-action="uncomplete-task" data-link-url="<%= toggle_task_state_my_module_path(@my_module) %>">
|
||||
<%= render 'my_modules/state_button_uncomplete.html.erb' %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
<span data-hook="my_module-protocol-buttons"></span>
|
||||
</div>
|
Loading…
Reference in a new issue