From a36d570b37f2e89eafbd6985132eaf7f56ece825 Mon Sep 17 00:00:00 2001 From: Cody Cutrer Date: Tue, 30 Aug 2011 14:32:58 -0600 Subject: [PATCH] s/course_details/settings/g closes #5458 leave the old route in as well Change-Id: Ifdbc4bdf9d23d866d941fac0b33cff456514e89f Reviewed-on: https://gerrit.instructure.com/5345 Reviewed-by: Cody Cutrer Tested-by: Hudson --- app/controllers/courses_controller.rb | 9 ++++----- app/controllers/sections_controller.rb | 6 +++--- app/models/course.rb | 2 +- .../{course_details.sass => course_settings.sass} | 0 app/views/accounts/_course.html.erb | 2 +- .../{course_details.html.erb => settings.html.erb} | 4 ++-- config/assets.yml | 8 ++++---- config/locales/es.yml | 4 ++-- config/routes.rb | 3 ++- .../{course_details.js => course_settings.js} | 2 +- spec/controllers/courses_controller_spec.rb | 10 +++++----- ...ails.html.erb_spec.rb => settings.html.erb_spec.rb} | 2 +- 12 files changed, 26 insertions(+), 26 deletions(-) rename app/stylesheets/{course_details.sass => course_settings.sass} (100%) rename app/views/courses/{course_details.html.erb => settings.html.erb} (99%) rename public/javascripts/{course_details.js => course_settings.js} (99%) rename spec/views/courses/{course_details.html.erb_spec.rb => settings.html.erb_spec.rb} (97%) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 7db9d3d9d1e..8460ead1ca4 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -287,13 +287,12 @@ class CoursesController < ApplicationController end end - def course_details + def settings get_context if authorized_action(@context, @current_user, :read_as_admin) @alerts = @context.alerts @role_types = [] add_crumb(t('#crumbs.settings', "Settings"), named_context_url(@context, :context_details_url)) - render :action => :course_details end end @@ -327,7 +326,7 @@ class CoursesController < ApplicationController e.re_send_confirmation! if e.invited? end respond_to do |format| - format.html { redirect_to course_details_url } + format.html { redirect_to course_settings_url } format.json { render :json => {:re_sent => true}.to_json } end end @@ -582,7 +581,7 @@ class CoursesController < ApplicationController @user_groups = @current_user.group_memberships_for(@context) if @current_user @unauthorized_user = @finished_enrollment.user rescue nil if !@context.grants_right?(@current_user, session, :read) && @context.grants_right?(@current_user, session, :read_as_admin) - return redirect_to course_details_path(@context.id) + return redirect_to course_settings_path(@context.id) end if authorized_action(@context, @current_user, :read) @@ -938,6 +937,6 @@ class CoursesController < ApplicationController get_context return unless authorized_action(@context, @current_user, :manage_content) @new_course = @context.reset_content - redirect_to course_details_path(@new_course.id) + redirect_to course_settings_path(@new_course.id) end end diff --git a/app/controllers/sections_controller.rb b/app/controllers/sections_controller.rb index 64fa89b12ca..18b9c943c7d 100644 --- a/app/controllers/sections_controller.rb +++ b/app/controllers/sections_controller.rb @@ -25,11 +25,11 @@ class SectionsController < ApplicationController respond_to do |format| if @section.save flash[:notice] = t('section_created', "Section successfully created!") - format.html { redirect_to course_details_url(@context) } + format.html { redirect_to course_settings_url(@context) } format.json { render :json => @section.to_json } else flash[:error] = t('section_creation_failed', "Section creation failed") - format.html { redirect_to course_details_url(@context) } + format.html { redirect_to course_settings_url(@context) } format.json { render :json => @section.errors.to_json, :status => :bad_request } end end @@ -125,7 +125,7 @@ class SectionsController < ApplicationController if @section.enrollments.empty? @section.destroy flash[:notice] = t('section_deleted', "Course section successfully deleted!") - format.html { redirect_to course_details_url(@context) } + format.html { redirect_to course_settings_url(@context) } format.json { render :json => @section.to_json } else flash[:error] = t('section_delete_not_allowed', "You can't delete a section that has enrollments") diff --git a/app/models/course.rb b/app/models/course.rb index 1c801797982..66aa1df0a46 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -2165,7 +2165,7 @@ class Course < ActiveRecord::Base { :id => TAB_MODULES, :label => t('#tabs.modules', "Modules"), :css_class => 'modules', :href => :course_context_modules_path }, { :id => TAB_CONFERENCES, :label => t('#tabs.conferences', "Conferences"), :css_class => 'conferences', :href => :course_conferences_path }, { :id => TAB_COLLABORATIONS, :label => t('#tabs.collaborations', "Collaborations"), :css_class => 'collaborations', :href => :course_collaborations_path }, - { :id => TAB_SETTINGS, :label => t('#tabs.settings', "Settings"), :css_class => 'settings', :href => :course_details_path }, + { :id => TAB_SETTINGS, :label => t('#tabs.settings', "Settings"), :css_class => 'settings', :href => :course_settings_path }, ] end diff --git a/app/stylesheets/course_details.sass b/app/stylesheets/course_settings.sass similarity index 100% rename from app/stylesheets/course_details.sass rename to app/stylesheets/course_settings.sass diff --git a/app/views/accounts/_course.html.erb b/app/views/accounts/_course.html.erb index 0ed7b9b4220..45874263543 100644 --- a/app/views/accounts/_course.html.erb +++ b/app/views/accounts/_course.html.erb @@ -25,7 +25,7 @@ <% end %>
- <%= link_to t(:settings_link, "Settings"), course_details_path(course ? course : "{{ id }}") %> | + <%= link_to t(:settings_link, "Settings"), course_settings_path(course ? course : "{{ id }}") %> | <%= link_to t(:statistics_link, "Statistics"), course_statistics_path(course ? course : "{{ id }}") %> | <%= link_to t(:homepage_link, "Homepage"), course_path(course ? course : "{{ id }}") %> diff --git a/app/views/courses/course_details.html.erb b/app/views/courses/settings.html.erb similarity index 99% rename from app/views/courses/course_details.html.erb rename to app/views/courses/settings.html.erb index 4a0b9396065..36c051843a2 100644 --- a/app/views/courses/course_details.html.erb +++ b/app/views/courses/settings.html.erb @@ -1,7 +1,7 @@ <% content_for :page_title, join_title(t(:page_title, "Course Details"), @context.name) - jammit_css :course_details - jammit_js :course_details + jammit_css :course_settings + jammit_js :course_settings @active_tab = "settings" enrollment_hashes = {} diff --git a/config/assets.yml b/config/assets.yml index 07bbc30557d..95a0212e901 100644 --- a/config/assets.yml +++ b/config/assets.yml @@ -107,10 +107,10 @@ javascripts: - public/javascripts/context_inbox.js context_modules: - public/javascripts/context_modules.js - course_details: + course_settings: - public/javascripts/jquery.cookie.js - public/javascripts/user_lists.js - - public/javascripts/course_details.js + - public/javascripts/course_settings.js - public/javascripts/external_tools.js - public/javascripts/grading_standards.js grading_standards: @@ -305,8 +305,8 @@ stylesheets: - public/stylesheets/compiled/gradebook_uploads.css calendar: - public/stylesheets/static/calendar.css - course_details: - - public/stylesheets/compiled/course_details.css + course_settings: + - public/stylesheets/compiled/course_settings.css - public/stylesheets/compiled/external_tools.css - public/stylesheets/compiled/grading_standards.css full_files: diff --git a/config/locales/es.yml b/config/locales/es.yml index 7e92e9cd834..8dff2fbc022 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -2267,7 +2267,7 @@ es: all: Cualquiera only_teachers: "Sólo Profesores" teachers_students: "Profesor y Estudiantes" - course_details: + course_settings: buttons: add_section: "Agregar Sección" adding_section: "Agregando Sección..." @@ -2396,7 +2396,7 @@ es: start_at: "Fecha de Inicio" titles: copy_course: "Copiar el Curso" - course_details: + course_settings: accepted_invitation: "%{user} ya ha recibido y aceptado la invitación a unirse al curso, pero todavía puede reenviar la invitación si la necesitan." admin_invitation_unaccepted: "%{user} aún no ha aceptado la invitación para unirse al curso. La invitación fue enviada: %{time}" buttons: diff --git a/config/routes.rb b/config/routes.rb index 2a19413120b..da1a29dbbbb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -89,7 +89,8 @@ ActionController::Routing::Routes.draw do |map| end course.undelete_items 'undelete', :controller => 'context', :action => 'undelete_index' course.undelete_item 'undelete/:asset_string', :controller => 'context', :action => 'undelete_item' - course.details 'details', :controller => 'courses', :action => 'course_details' + course.settings 'settings', :controller => 'courses', :action => 'settings' + course.details 'details', :controller => 'courses', :action => 'settings' course.re_send_invitations 're_send_invitations', :controller => 'courses', :action => 're_send_invitations', :conditions => {:method => :post} course.enroll_users 'enroll_users', :controller => 'courses', :action => 'enroll_users' course.link_enrollment 'link_enrollment', :controller => 'courses', :action => 'link_enrollment' diff --git a/public/javascripts/course_details.js b/public/javascripts/course_settings.js similarity index 99% rename from public/javascripts/course_details.js rename to public/javascripts/course_settings.js index 5b4d439f8c8..3485fb5251e 100644 --- a/public/javascripts/course_details.js +++ b/public/javascripts/course_settings.js @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -I18n.scoped('course_details', function(I18n) { +I18n.scoped('course_settings', function(I18n) { function checkup() { $.ajaxJSON($("#sis_publish_link").attr('href'), 'GET', {}, function(data) { if (!data.hasOwnProperty("sis_publish_status")) { diff --git a/spec/controllers/courses_controller_spec.rb b/spec/controllers/courses_controller_spec.rb index f43925348de..cf53f9bc257 100644 --- a/spec/controllers/courses_controller_spec.rb +++ b/spec/controllers/courses_controller_spec.rb @@ -37,24 +37,24 @@ describe CoursesController do end end - describe "GET 'course_details'" do + describe "GET 'settings'" do it "should require authorization" do course_with_teacher(:active_all => true) - get 'course_details', :course_id => @course.id + get 'settings', :course_id => @course.id assert_unauthorized end it "should should not allow students" do course_with_student_logged_in(:active_all => true) - get 'course_details', :course_id => @course.id + get 'settings', :course_id => @course.id assert_unauthorized end it "should render properly" do course_with_teacher_logged_in(:active_all => true) - get 'course_details', :course_id => @course.id + get 'settings', :course_id => @course.id response.should be_success - response.should render_template("course_details") + response.should render_template("settings") end end diff --git a/spec/views/courses/course_details.html.erb_spec.rb b/spec/views/courses/settings.html.erb_spec.rb similarity index 97% rename from spec/views/courses/course_details.html.erb_spec.rb rename to spec/views/courses/settings.html.erb_spec.rb index 78321952699..c895c799bc4 100644 --- a/spec/views/courses/course_details.html.erb_spec.rb +++ b/spec/views/courses/settings.html.erb_spec.rb @@ -19,7 +19,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') require File.expand_path(File.dirname(__FILE__) + '/../views_helper') -describe "courses/course_details.html.erb" do +describe "courses/settings.html.erb" do describe "sis_source_id edit box" do before do course_with_teacher(:active_all => true)