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

* 'publication' of https://github.com/Rulingcom/orbit:
  coauthor edit and destroy fixed
This commit is contained in:
Rueshyna committed 2012-12-03 12:34:46 +08:00
commit fe5e5fd974
4 files changed
+52 -4

No files matched your search

+2 -2
View File
@@ -16,8 +16,8 @@
<td><%= co_author.co_author %></td>
<td><%= co_author.email %></td>
<td><%= co_author.type%></td>
<td><%= link_to 'Edit', edit_desktop_co_author_path(co_author) %></td>
<td><%= link_to 'Destroy', desktop_co_author_path(co_author), method: :delete, confirm: 'Are you sure?' %></td>
<td><%= link_to 'Edit', edit_desktop_co_author_path(co_author), :class => "bt-edit" %></td>
<td><%= link_to 'Destroy', desktop_co_author_path(co_author), method: :delete, confirm: 'Are you sure?', :class=>"bt-delete" %></td>
</tr>
<% end %>
</table>
+1 -1
View File
@@ -1,5 +1,5 @@
<%= form_for(resource, :as => resource_name, :url => users_passwd_path(resource_name), :html => { :method => :put, "form-type"=>"ajax_form" }) do |f| %>
<%= form_for(resource, :as => resource_name, :url => users_passwd_path(resource_name), :html => { :method => :put, "form-type"=>"ajax_form" ,"callback-method"=>"passwordUpdate" }) do |f| %>
<div><%= f.submit "Update" %></div>
<div><%= f.label :current_password %>