cafe-grader-web Commit - r330:82d41889f7a0

cafe-grader-web

Commit `r330:82d41889f7a0` public

parent | child

Description:

fixed in_place_editor for configs, updated form in users/new

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r330:82d41889f7a0 - Tue, 02 Oct 2012 08:32:42 - 3 files changed: 8 inserted, 8 deleted

app/controllers/configurations_controller.rb ¶ +3 -3

               class ConfigurationsController < ApplicationController
                 before_filter :authenticate
                 before_filter { |controller| controller.authorization_by_roles(['admin'])}
-            -   in_place_edit_for :configuration, :key
+            +   in_place_edit_for :grader_configuration, :key
-            -   in_place_edit_for :configuration, :type
+            +   in_place_edit_for :grader_configuration, :type
-            -   in_place_edit_for :configuration, :value
+            +   in_place_edit_for :grader_configuration, :value
                 def index
                   @configurations = GraderConfiguration.find(:all,
                                                        :order => '`key`')
                 end
                 def reload
                   GraderConfiguration.reload
                   redirect_to :action => 'index'
                 end
               end

app/views/configurations/index.html.haml ¶ +4 -4

               %h1 System configuration
               %table.info
                 %tr.info-head
                   %th Key
                   %th Type
                   %th Value
                   %th Description
                 - @configurations.each do |conf|
-            -     - @configuration = conf
+            +     - @grader_configuration = conf
                   %tr{:class => cycle("info-odd", "info-even")}
                     %td
-            -         = in_place_editor_field :configuration, :key, {}, :rows=>1
+            +         = in_place_editor_field :grader_configuration, :key, {}, :rows=>1
                     %td
-            -         = in_place_editor_field :configuration, :value_type, {}, :rows=>1
+            +         = in_place_editor_field :grader_configuration, :value_type, {}, :rows=>1
                     %td
-            -         = in_place_editor_field :configuration, :value, {}, :rows=>1
+            +         = in_place_editor_field :grader_configuration, :value, {}, :rows=>1
                     %td= conf.description
               - if GraderConfiguration.config_cached?
                 %br/
                 Your config is saved, but it does not automatically take effect.
                 %br/
                 If you have one mongrel process running, you can
                 = link_to '[click]', :action => 'reload'
                 here to reload.
                 %br/
                 If you have more than one process running, you should restart
                 them manually.

app/views/users/new.html.haml ¶ +1 -1

               .contest-title
                 %h1
                   = "#{GraderConfiguration['contest.name']}: #{t 'registration.title'}"
               .registration-desc
                 =t 'registration.description'
               = error_messages_for :user, :header_message => (t 'registration.errors.header')
               %table
-            -   = form_for :user, @user, :url => { :action => 'register' } do |f|
+            +   = form_for @user, :url => { :action => 'register' } do |f|
                   %tr
                     %td{:align => "right"}
                       = "#{t 'login_label'}:"
                     %td= f.text_field :login
                   %tr
                     %td
                     %td
                       %small
                         =t 'registration.login_guide'
                   %tr
                     %td{:align => "right"}
                       = "#{t 'full_name_label'}:"

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r330:82d41889f7a0 - Tue, 02 Oct 2012 08:32:42 - 3 files changed: 8 inserted, 8 deleted

Sign in to your account

Commit r330:82d41889f7a0 public

Author

r330:82d41889f7a0 - Tue, 02 Oct 2012 08:32:42 - 3 files changed: 8 inserted, 8 deleted

Commit `r330:82d41889f7a0` public