diff --git a/app/assets/javascripts/toolbar.js b/app/assets/javascripts/toolbar.js index f611ac4..31c6b43 100644 --- a/app/assets/javascripts/toolbar.js +++ b/app/assets/javascripts/toolbar.js @@ -54,7 +54,7 @@ tbody.append('') var submit = $('').appendTo(tfoot); - cancel = $('' + I18n.t("helpers.cancel") + '').appendTo(tfoot); + cancel = $('' + I18n.t("helpers.submit.cancel") + '').appendTo(tfoot); cancel.click(function(e) { e.preventDefault(); diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index efd8913..3b603d1 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -26,9 +26,6 @@ # GET /projects/1 # GET /projects/1.json def show - -puts "PARAMS: #{params.inspect}" - @project = Project.find(params[:id]) @show_form = false if params[:show_form] == "yes" then @@ -72,9 +69,6 @@ # GET /projects/1/edit # Should this be removed? def edit - -puts "PARAMS: #{params.inspect}" - @project = Project.find(params[:id]) if !user_signed_in? then respond_to do |format| diff --git a/app/controllers/settings/projects_controller.rb b/app/controllers/settings/projects_controller.rb index 390d777..8c0c814 100644 --- a/app/controllers/settings/projects_controller.rb +++ b/app/controllers/settings/projects_controller.rb @@ -5,6 +5,9 @@ before_filter :get_settings def show + +puts "COLS: #{settings_json.inspect}" + respond_to do |format| format.html format.json { render json: settings_json } @@ -12,7 +15,9 @@ end def update - columns = (params[:columns] || {}).keys.map(&:intern) + columns = (params[:columns] || {}) + +puts "COLUMNS: #{params[:columns].inspect}" if @settings.update_attributes(columns: columns) respond_to do |format| diff --git a/app/helpers/plans_helper.rb b/app/helpers/plans_helper.rb index 9c627cf..3588ed0 100644 --- a/app/helpers/plans_helper.rb +++ b/app/helpers/plans_helper.rb @@ -2,8 +2,8 @@ def project_list_head(column) klass = case column - when :name then :dmp_th_big - when :description then :dmp_th_big + when 'name' then :dmp_th_big + when 'description' then :dmp_th_big else :dmp_th_small end @@ -12,10 +12,12 @@ def project_list_body(column, project) klass, content = case column - when :name + when 'name' [ "dmp_td_big", link_to(project.title, project_path(project), class: "dmp_table_link") ] - when :owner + + when 'owner' user = project.owner + text = if user.nil? "Unknown" elsif user == current_user @@ -25,13 +27,13 @@ end [ "tmp_td_small", text ] - when :shared + when 'shared' shared_num = project.project_groups.count - 1 text = shared_num > 0 ? (t("helpers.yes_label") + " (with #{shared_num} people) ") : t("helpers.no_label") [ "dmp_td_small", text ] - when :last_edited + when 'last_edited' [ "dmp_td_small", l(project.latest_update.to_date, formats: :short) ] - when :description + when 'description' [ "dmp_td_medium", (project.try(column) || "Unknown") ] else [ "dmp_td_small", (project.try(column) || "Unknown") ] diff --git a/app/models/settings/plan_list.rb b/app/models/settings/plan_list.rb index c7fce42..77d7a6a 100644 --- a/app/models/settings/plan_list.rb +++ b/app/models/settings/plan_list.rb @@ -11,8 +11,8 @@ cols = value["columns"] if cols.present? # columns can be empty, in which case they revert to defaults errors.add(:columns, I18n.t("helpers.settings.projects.errors.no_name")) unless cols.member?(:name) - errors.add(:columns, I18n.t("helpers.settings.projects.errors.duplicate")) unless cols.uniq == cols - errors.add(:columns, I18n.t("helpers.settings.projects.errors.unknown")) unless (cols.uniq & ALL_COLUMNS) == cols.uniq + errors.add(:columns, I18n.t("helpers.settings.projects.errors.duplicate")) unless cols.to_a.uniq == cols + errors.add(:columns, I18n.t("helpers.settings.projects.errors.unknown")) unless (cols.to_a.uniq & ALL_COLUMNS) == cols.to_a.uniq end end end