will/Open-Source-Access-Control-Web-Interface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added more_info notice and fixed payments cancan bug

Browse Source
This commit is contained in:
Will Bradley 2013-09-28 19:34:08 -07:00
parent 42679aa410
commit 7bfd45a163
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/payments_controller.rb
View File

@ -1,6 +1,6 @@
class PaymentsController < ApplicationController class PaymentsController < ApplicationController
load_and_authorize_resource :payment load_and_authorize_resource :payment
load_and_authorize_resource :user, :through => :payment #load_and_authorize_resource :user, :through => :payment
before_filter :authenticate_user! before_filter :authenticate_user!
# Load users and certs based on current ability # Load users and certs based on current ability

2
app/views/settings/edit.html.erb
View File

@ -9,7 +9,7 @@ $(function(){
<div class="field"> <div class="field">
<%= text_area_tag :value, @setting[:value], :cols => 50, :class => "wysiwyg" %><br/> <%= text_area_tag :value, @setting[:value], :cols => 50, :class => "wysiwyg" %><br/>
</div> </div>
<em>Note: there is a /more_info page you can link to for wysiwyg purposes.</em>
<div class="field"> <div class="field">
<%= submit_tag "Save", {:class => "wymupdate"} %><br/> <%= submit_tag "Save", {:class => "wymupdate"} %><br/>
<%= link_to "Back", settings_path %> <%= link_to "Back", settings_path %>