From e27192295d65ba7f9c1f8c9fffeaeb66d3406349 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 16 Oct 2014 15:14:37 +0800 Subject: [PATCH 01/14] user save bug fixed --- app/controllers/admin/members_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb index 6c8da99..8f8dcf6 100644 --- a/app/controllers/admin/members_controller.rb +++ b/app/controllers/admin/members_controller.rb @@ -464,6 +464,7 @@ class Admin::MembersController < OrbitMemberController if user_params["user_name"] != "" @user = User.new(user_params) rescue nil @user.member_profile = @member + @user.save end if @member.save if !params[:member_profile_field_values].nil? From b4533a1720250ea8da86b0c8a2fcabf34223633b Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 16 Oct 2014 18:35:23 +0800 Subject: [PATCH 02/14] fix for upgrading 4.2 to 4.5 --- app/uploaders/asset_uploader.rb | 23 +++++++++++++++++++++++ app/uploaders/image_uploader.rb | 22 ++++++++++++++++++++++ lib/tasks/upgrade.rake | 33 ++++++++++++++++++++++++++++++++- 3 files changed, 77 insertions(+), 1 deletion(-) diff --git a/app/uploaders/asset_uploader.rb b/app/uploaders/asset_uploader.rb index 0ed1d48..8db6f57 100644 --- a/app/uploaders/asset_uploader.rb +++ b/app/uploaders/asset_uploader.rb @@ -21,6 +21,29 @@ class AssetUploader < CarrierWave::Uploader::Base "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" end + # override + def filename + @original_filename + end + + # override + def original_filename=(filename) + @original_filename = super(filename) + + if(@original_filename.bytesize > 200) + original_file_extension = File.extname(@original_filename) + + @original_filename.force_encoding("ascii-8bit") + @original_filename = @original_filename[0, (200 - original_file_extension.bytesize)] + @original_filename.encode!("UTF-16BE", "UTF-8", :invalid => :replace, :undef => :replace, :replace => '') + @original_filename.encode!("UTF-8") + + @original_filename += original_file_extension + end + + @original_filename + end + # Provide a default URL as a default if there hasn't been a file uploaded: # def default_url # "/images/fallback/" + [version_name, "default.png"].compact.join('_') diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb index 61a699b..8ad579d 100644 --- a/app/uploaders/image_uploader.rb +++ b/app/uploaders/image_uploader.rb @@ -19,6 +19,28 @@ class ImageUploader < CarrierWave::Uploader::Base "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" end + # override + def filename + @original_filename + end + + # override + def original_filename=(filename) + @original_filename = super(filename) + + if(@original_filename.bytesize > 200) + original_file_extension = File.extname(@original_filename) + + @original_filename.force_encoding("ascii-8bit") + @original_filename = @original_filename[0, (200 - original_file_extension.bytesize)] + @original_filename.encode!("UTF-16BE", "UTF-8", :invalid => :replace, :undef => :replace, :replace => '') + @original_filename.encode!("UTF-8") + + @original_filename += original_file_extension + end + + @original_filename + end # Provide a default URL as a default if there hasn't been a file uploaded: # def default_url # # For Rails 3.1+ asset pipeline compatibility: diff --git a/lib/tasks/upgrade.rake b/lib/tasks/upgrade.rake index 8dd6516..3fc9029 100644 --- a/lib/tasks/upgrade.rake +++ b/lib/tasks/upgrade.rake @@ -50,6 +50,8 @@ namespace :upgrade do bulletin.other_mailaddress = announcement["other_mailaddress"] bulletin.public = announcement["public"] bulletin.subtitle_translations = announcement["subtitle"] + announcement["text"]["en"] = smart_downloader(announcement["text"]["en"], args.url.chomp("/")) + announcement["text"]["zh_tw"] = smart_downloader(announcement["text"]["zh_tw"], args.url.chomp("/")) bulletin.text_translations = announcement["text"] bulletin.title_translations = announcement["title"] bulletin.remote_image_url = announcement["image"] @@ -84,4 +86,33 @@ namespace :upgrade do puts "Import has some problem." end end -end \ No newline at end of file +end + +def smart_downloader(data,url) + @data = data + @user = User.where(:user_name => "rulingcom").first + excluded_extensions = ["php","/"] + regex = /https?:\/\/[\S]+/ + # @links = URI.extract(@data) rescue [] + @links = @data.scan(regex) rescue [] + @links = @links.map{|link| link.chomp("\"") if (link.include?url rescue false)}.reject{|link| link.nil?}.uniq + @links.each do |link| + link = link.gsub("\&\;","&") + temp = link.gsub(url,"") + extension = temp.split(".").last rescue nil + if (extension.nil? || excluded_extensions.include?(extension)) + @data = @data.sub(link,"#") + else + a = Asset.new + a.remote_data_url = link + a.title_translations = {"en" => a.data.filename, "zh_tw" => a.data.filename} + if (a.save! rescue false) + @user.assets << a + @user.save + link = link.gsub("&","\&\;") + @data = @data.sub(link, a.data.url) + end + end + end + @data + end \ No newline at end of file From 78839a64d022422af233c415678b357e346fe218 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 16 Oct 2014 19:55:32 +0800 Subject: [PATCH 03/14] removed rulingcom user from user list --- app/views/admin/members/_member_for_listing.html.erb | 4 ++-- app/views/admin/members/_member_for_summary.html.erb | 3 ++- app/views/admin/members/_member_for_thumbnail.html.erb | 2 ++ app/views/admin/members/_user_basic_passwd.html.erb | 2 +- app/views/shared/_side_bar.html.erb | 5 +++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/views/admin/members/_member_for_listing.html.erb b/app/views/admin/members/_member_for_listing.html.erb index 3c67867..9c1d21c 100644 --- a/app/views/admin/members/_member_for_listing.html.erb +++ b/app/views/admin/members/_member_for_listing.html.erb @@ -1,5 +1,4 @@ <% if member_for_listing.present? && (!member_for_listing.user.present? || member_for_listing.user.approved) %> - <% if member_for_listing.sex == 'male' @member_gender = 'gender-man' @@ -9,7 +8,7 @@ @member_gender = 'gender-none' end %> - + <% if (member_for_listing.user.user_name != "rulingcom" rescue true) %> @@ -32,4 +31,5 @@ <%= member_for_listing.email %> + <% end %> <% end %> \ No newline at end of file diff --git a/app/views/admin/members/_member_for_summary.html.erb b/app/views/admin/members/_member_for_summary.html.erb index f39a439..cd04ff4 100644 --- a/app/views/admin/members/_member_for_summary.html.erb +++ b/app/views/admin/members/_member_for_summary.html.erb @@ -1,4 +1,5 @@ <% if member_for_summary.present? && (!member_for_summary.user.present? || member_for_summary.user.approved) %> + <% if (member_for_summary.user.user_name != "rulingcom" rescue true) %>
  • <% @@ -36,5 +37,5 @@
    • <% end %> - +<% end %> diff --git a/app/views/admin/members/_member_for_thumbnail.html.erb b/app/views/admin/members/_member_for_thumbnail.html.erb index 2581b4f..56a4cdc 100644 --- a/app/views/admin/members/_member_for_thumbnail.html.erb +++ b/app/views/admin/members/_member_for_thumbnail.html.erb @@ -8,6 +8,7 @@ @user_sex = 'gender-none' end %> + <% if (member_for_thumbnail.user.user_name != "rulingcom" rescue true) %>
  • @@ -20,4 +21,5 @@

    <%= link_to (member_for_thumbnail.name != (member_for_thumbnail.email) ? member_for_thumbnail.name : member_for_thumbnail.id),admin_member_path(member_for_thumbnail) %>

    • +<% end %> <% end %> \ No newline at end of file diff --git a/app/views/admin/members/_user_basic_passwd.html.erb b/app/views/admin/members/_user_basic_passwd.html.erb index 035746d..429e73d 100644 --- a/app/views/admin/members/_user_basic_passwd.html.erb +++ b/app/views/admin/members/_user_basic_passwd.html.erb @@ -12,7 +12,7 @@
    - <% if current_user.is_admin? %> + <% if current_user.is_admin? && (@user.user_name != "rulingcom" rescue false) %> <%= f.text_field :user_name, :class=>"input-medium", :id=>"account", :placeholder=>"#{t('users.user_id')}" %> <%= t("users.user_id_note")%> <% else %> diff --git a/app/views/shared/_side_bar.html.erb b/app/views/shared/_side_bar.html.erb index 9108dff..b80fe3d 100644 --- a/app/views/shared/_side_bar.html.erb +++ b/app/views/shared/_side_bar.html.erb @@ -20,8 +20,9 @@
  • <%= link_to admin_site_update_manager_path(current_site), :class => active_for_action('sites', 'update_manager') do %><%end%>
  • "><%= link_to admin_site_system_info_path(current_site), :class => active_for_action('sites', 'system_info') do %><%end%>
    • - -
  • "><%= link_to admin_import_path, :class => active_for_action('import','') do %><%end%>
    • + <% if (current_user.user_name == "rulingcom" rescue false) %> +
  • "><%= link_to admin_import_path, :class => active_for_action('import','') do %><%end%>
    • + <% end %>
    From 6473abeb44b3a9f667522c7383dc5ed6a078f7e3 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Fri, 17 Oct 2014 18:24:03 +0800 Subject: [PATCH 04/14] added deadline and postdate to announcement upgrades --- lib/tasks/upgrade.rake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/tasks/upgrade.rake b/lib/tasks/upgrade.rake index 3fc9029..128d845 100644 --- a/lib/tasks/upgrade.rake +++ b/lib/tasks/upgrade.rake @@ -49,6 +49,8 @@ namespace :upgrade do bulletin.email_sentdate = announcement["email_sentdate"] bulletin.other_mailaddress = announcement["other_mailaddress"] bulletin.public = announcement["public"] + bulletin.postdate = announcement["postdate"] + bulletin.deadline = announcement["deadline"] bulletin.subtitle_translations = announcement["subtitle"] announcement["text"]["en"] = smart_downloader(announcement["text"]["en"], args.url.chomp("/")) announcement["text"]["zh_tw"] = smart_downloader(announcement["text"]["zh_tw"], args.url.chomp("/")) From 9c19a4a2fd0a20706ca1e7874528d9e2070231f6 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 20 Oct 2014 18:50:36 +0800 Subject: [PATCH 05/14] added non approved users can view profile and not rest of system --- app/controllers/admin/dashboards_controller.rb | 1 + app/controllers/admin/members_controller.rb | 7 +++++-- app/controllers/application_controller.rb | 4 +++- app/controllers/orbit_admin_controller.rb | 2 +- app/controllers/orbit_member_controller.rb | 6 +++--- app/controllers/sessions_controller.rb | 10 +++++----- app/helpers/orbit_backend_helper.rb | 2 +- app/views/admin/dashboards/index.html.erb | 2 +- lib/orbit_app/helper/context_link_renderer.rb | 5 ++++- lib/orbit_app/helper/side_bar_renderer.rb | 6 +++++- lib/orbit_core_lib.rb | 6 +++--- 11 files changed, 32 insertions(+), 19 deletions(-) diff --git a/app/controllers/admin/dashboards_controller.rb b/app/controllers/admin/dashboards_controller.rb index fec9da1..0a33a46 100644 --- a/app/controllers/admin/dashboards_controller.rb +++ b/app/controllers/admin/dashboards_controller.rb @@ -8,6 +8,7 @@ class Admin::DashboardsController < ApplicationController @module_app_contents, @module_app_contents_total = get_module_app_count(apps) @recent_updated = get_recently_updated(apps) @most_visited = get_most_visited(apps) + render_401 and return if !current_user.is_approved? rescue false end def get_cpu_usage diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb index 8f8dcf6..eb775e0 100644 --- a/app/controllers/admin/members_controller.rb +++ b/app/controllers/admin/members_controller.rb @@ -29,7 +29,9 @@ class Admin::MembersController < OrbitMemberController @filter = {@new_filter[:type] => [@new_filter[:id].to_s]} end - if @filter.blank? and @mq.blank? + render_401 and return if current_user.nil? || !current_user.is_approved? + + if @filter.blank? and @mq.blank? render case params[:at] when 'summary' @@ -72,7 +74,7 @@ class Admin::MembersController < OrbitMemberController end end - + end def show @@ -92,6 +94,7 @@ class Admin::MembersController < OrbitMemberController end get_info_and_roles + render_401 and return if current_user.nil? || (@member.id.to_s != current_user.member_profile.id.to_s && !current_user.is_approved?) end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index cd5d683..bfbc6cf 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -134,7 +134,9 @@ class ApplicationController < ActionController::Base redirect_to new_session_path if @current_user.nil? return true - else + elsif current_site.backend_openness_on + return true + elsif session[:login_referer] = request.url redirect_to new_session_path return false diff --git a/app/controllers/orbit_admin_controller.rb b/app/controllers/orbit_admin_controller.rb index 3e2ae71..5d56a00 100644 --- a/app/controllers/orbit_admin_controller.rb +++ b/app/controllers/orbit_admin_controller.rb @@ -77,7 +77,7 @@ class OrbitAdminController < ApplicationController end def load_authorized_categories - @user_authenticated_categories = current_user.is_admin? ? ["all"] : current_user.approved_categories.collect{|c| c.id} + @user_authenticated_categories = current_user.is_admin? ? ["all"] : current_user.approved_categories.collect{|c| c.id} rescue [] end diff --git a/app/controllers/orbit_member_controller.rb b/app/controllers/orbit_member_controller.rb index b553ab9..038ac80 100644 --- a/app/controllers/orbit_member_controller.rb +++ b/app/controllers/orbit_member_controller.rb @@ -6,14 +6,14 @@ class OrbitMemberController < ApplicationController def check_aceess_rights @user_has_privileges = false - if current_user.is_admin? + if (current_user.is_admin? rescue false) @user_has_privileges = true else visited_user = MemberProfile.find_by(:uid => params[:id].split("-").last).user.id rescue nil - visited_user = MemberProfile.find_by(:uid => params[:member_id].split("-").last).user.id if visited_user.nil? rescue nil + visited_user = MemberProfile.find_by(:uid => params[:member_id].split("-").last).user.id if visited_user.nil? rescue nil visited_user = MemberProfile.find_by(:uid => params[:uid]).user.id if visited_user.nil? rescue nil visited_user = MemberProfile.find(params[:member_profile_id]).user.id if visited_user.nil? rescue nil - if current_user.id == visited_user + if (current_user.id == visited_user rescue false) @user_has_privileges = true else @user_has_privileges = false diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 9c4071c..972fd27 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -10,7 +10,7 @@ class SessionsController < ApplicationController def create user = User.find_by(user_name: params[:user_name]) rescue nil if (user && user.authenticate(params[:password]) && user.is_confirmed?.eql?(true)) - if user.is_approved? || user.is_admin? + # if user.is_approved? || user.is_admin? session[:user_id] = user.id session[:login_referer] = nil if params[:referer_url] @@ -18,10 +18,10 @@ class SessionsController < ApplicationController else redirect_to admin_dashboards_path end - else - flash.now.alert = "User not approved." - render "new" - end + # else + # flash.now.alert = "User not approved." + # render "new" + # end else flash.now.alert = "Invalid username or password" render "new" diff --git a/app/helpers/orbit_backend_helper.rb b/app/helpers/orbit_backend_helper.rb index 74bcb79..0145e85 100644 --- a/app/helpers/orbit_backend_helper.rb +++ b/app/helpers/orbit_backend_helper.rb @@ -141,7 +141,7 @@ module OrbitBackendHelper if @user_authenticated_categories.first == "all" return true else - @user_authenticated_categories.include?obj.category_id rescue current_user.is_manager?(@module_app) + @user_authenticated_categories.include?obj.category_id rescue (current_user.is_manager?(@module_app) rescue false) end end diff --git a/app/views/admin/dashboards/index.html.erb b/app/views/admin/dashboards/index.html.erb index f111e36..210cd7a 100644 --- a/app/views/admin/dashboards/index.html.erb +++ b/app/views/admin/dashboards/index.html.erb @@ -5,7 +5,7 @@
    - <% if current_user.is_admin? %> + <% if (current_user.is_admin? rescue false) %>
    <%= render 'server_loading' %> diff --git a/lib/orbit_app/helper/context_link_renderer.rb b/lib/orbit_app/helper/context_link_renderer.rb index 72ac5d0..33ef2b4 100644 --- a/lib/orbit_app/helper/context_link_renderer.rb +++ b/lib/orbit_app/helper/context_link_renderer.rb @@ -6,6 +6,7 @@ module ContextLinkRenderer @belong_module_app = belong_module_app @request = request @params = params + @site = Site.first @current_user = current_user @available_for = available_for if can_display? @@ -15,7 +16,9 @@ module ContextLinkRenderer def can_display? status = "users" - if @current_user.is_admin? + if @site.backend_openness_on && @current_user.nil? + status = "users" + elsif @current_user.is_admin? status = "admin" elsif @current_user.is_manager?(@belong_module_app) status = "managers" diff --git a/lib/orbit_app/helper/side_bar_renderer.rb b/lib/orbit_app/helper/side_bar_renderer.rb index 1d7e4dd..e4fe6a9 100644 --- a/lib/orbit_app/helper/side_bar_renderer.rb +++ b/lib/orbit_app/helper/side_bar_renderer.rb @@ -8,6 +8,7 @@ module SideBarRenderer @current_module_app = current_module_app @request = request @params = params + @site = Site.first @current_user = user @app_available_for = af if display? @@ -27,6 +28,7 @@ module SideBarRenderer @current_module_app = current_module_app @request = request @params = params + @site = Site.first @current_user = user @app_available_for = available_for if display? @@ -44,7 +46,9 @@ module SideBarRenderer def display? #控制sidebar 要不要算圖 status = "users" - if @current_user.is_admin? + if @site.backend_openness_on && @current_user.nil? + status = "users" + elsif @current_user.is_admin? status = "admin" elsif @current_user.is_manager?(@belong_module_app) status = "managers" diff --git a/lib/orbit_core_lib.rb b/lib/orbit_core_lib.rb index cc53914..5001c64 100644 --- a/lib/orbit_core_lib.rb +++ b/lib/orbit_core_lib.rb @@ -57,7 +57,7 @@ module OrbitCoreLib end @module_authorized_users ||= Authorization.module_authorized_users(@module_app.id).pluck(:user_id) rescue nil - if current_user.nil? + if current_user.nil? && !current_site.backend_openness_on redirect_to new_session_path return end @@ -65,7 +65,7 @@ module OrbitCoreLib if !@module_app.nil? check_user_can_use else - if !current_user.is_admin? + if current_user.nil? || !current_user.is_admin? render "public/401" end end @@ -89,7 +89,7 @@ module OrbitCoreLib end def allow?(af) - if !current_user.nil? + if !current_user.nil? && current_user.is_approved? status = "users" if current_user.is_admin? status = "admin" From 051b16529863dffe6ab9ba01ac0ee20217e33e9b Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 20 Oct 2014 19:50:16 +0800 Subject: [PATCH 06/14] fixed orbit bar lanugage and menu --- app/helpers/orbit_helper.rb | 4 ++++ app/views/orbit_bar/index.html.erb | 16 ++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/helpers/orbit_helper.rb b/app/helpers/orbit_helper.rb index c11e63c..e87e788 100644 --- a/app/helpers/orbit_helper.rb +++ b/app/helpers/orbit_helper.rb @@ -300,6 +300,10 @@ module OrbitHelper else res << "
  • #{params[:type].underscore.humanize.capitalize} #{t(:authorization_)}
    • " end + when 'images' + id = AlbumImage.find(params[:id]).album.id.to_s rescue "" + res << "
  • #{t('module_name.'+@module_app.key)}#{divider}
    • " + res << "
  • #{t(:theater)}
    • " when 'categories' if @module_app.key!='category' res << "
  • #{t('module_name.'+@module_app.key)}#{divider}
    • " diff --git a/app/views/orbit_bar/index.html.erb b/app/views/orbit_bar/index.html.erb index 9c5ff83..dbefefb 100644 --- a/app/views/orbit_bar/index.html.erb +++ b/app/views/orbit_bar/index.html.erb @@ -56,12 +56,14 @@ <%= t(:member_) %> -
  • -
  • - - <%= t(:settings) %> - -
    • + <% if current_user.is_admin? %> +
  • +
  • + + <%= t(:settings) %> + +
    • + <% end %> <% end %> @@ -104,6 +106,7 @@ <% end %>
  • + <% if @site_in_use_locales.count > 1 %> <% locale = session[:zh_cn] ? :zh_cn : I18n.locale %> <%= t((locale==:zh_tw ? :zh_tw_ : locale.to_s)) %>
      @@ -118,6 +121,7 @@ <% end %> <% end %>
    + <% end %>
    • <% if !current_user.nil? %>
  • From 384cc4d6f4da6f33b7bc66faba46d8e8c71c2a9f Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Tue, 21 Oct 2014 15:27:43 +0800 Subject: [PATCH 07/14] fix for chinese simplified and also new user added --- app/models/site.rb | 2 +- app/views/orbit_bar/index.html.erb | 2 +- config/environment.rb | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app/models/site.rb b/app/models/site.rb index cfe8242..fbd8b3f 100644 --- a/app/models/site.rb +++ b/app/models/site.rb @@ -21,7 +21,7 @@ class Site field :desktop_closed, :type => Boolean, :default => false field :enable_language_detection, :type => Boolean, :default => false field :enable_zh_cn, :type => Boolean, :default => true - field :default_locale, :default => "en" + field :default_locale, :default => "zh_tw" field :mobile_on, :type => Boolean, :default => false field :announcement_category, :type => Array, :default=>[] field :mobile_bar_color, :type => Array, :default=>[] diff --git a/app/views/orbit_bar/index.html.erb b/app/views/orbit_bar/index.html.erb index dbefefb..99e0a85 100644 --- a/app/views/orbit_bar/index.html.erb +++ b/app/views/orbit_bar/index.html.erb @@ -106,7 +106,7 @@
    • <% end %>
  • - <% if @site_in_use_locales.count > 1 %> + <% if @site_in_use_locales.count > 1 || current_site.enable_zh_cn %> <% locale = session[:zh_cn] ? :zh_cn : I18n.locale %> <%= t((locale==:zh_tw ? :zh_tw_ : locale.to_s)) %>
      diff --git a/config/environment.rb b/config/environment.rb index 8c47b1d..c022e23 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -246,4 +246,20 @@ if User.count==0 user.email = "orbit@rulingcom.com" user.approved = true user.save + + profile = MemberProfile.new + profile.first_name_translations = {:en=>'Admin', :zh_tw=>'Admin'} + profile.last_name_translations = {:en=>'Admin', :zh_tw=>'Admin'} + profile.email = "service@rulingcom.com" + profile.save + + user = User.new + user.workgroup = group + user.member_profile = profile + user.user_name = "admin" + user.password = "Ab-5508881" + user.email = "servicet@rulingcom.com" + user.approved = true + user.save + end \ No newline at end of file From 0cff91594c743ce0cece51b61243d160098577af Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 22 Oct 2014 14:51:14 +0800 Subject: [PATCH 08/14] member update modified and h2 tag in orbit bar --- app/controllers/admin/members_controller.rb | 9 ++++++--- app/views/orbit_bar/index.html.erb | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb index eb775e0..b3963ee 100644 --- a/app/controllers/admin/members_controller.rb +++ b/app/controllers/admin/members_controller.rb @@ -496,11 +496,14 @@ class Admin::MembersController < OrbitMemberController @user = @member.user @user.update(user_params) else - @user = User.new(user_params) - @user.member_profile = @member + if user_params["user_name"] != "" + @user = User.new(user_params) rescue nil + @user.member_profile = @member + @user.save + end end - if @member.update_attributes(member_profile_params) and @user.save + if @member.update_attributes(member_profile_params) if params[:edit_type]!="edit_privilege" and (params[:member_profile].nil? or params[:member_profile][:role_status_ids].nil?) @member.update_attributes(role_status_ids: []) end diff --git a/app/views/orbit_bar/index.html.erb b/app/views/orbit_bar/index.html.erb index 99e0a85..9b78ec7 100644 --- a/app/views/orbit_bar/index.html.erb +++ b/app/views/orbit_bar/index.html.erb @@ -36,9 +36,9 @@ -

      +

      Orbit -

      +
    • - <% @site_in_use_locales.each do |locale| %> + <% @site_valid_locales.each do |locale| %> <%= f.label :locale, "#{t(:title)} #{t(locale)}" %>
    <%= f.fields_for :name_translations do |n| %> @@ -170,7 +170,7 @@
    - <% @site_in_use_locales.each do |locale| %> + <% @site_valid_locales.each do |locale| %>
    - <% @site_in_use_locales.each do |locale| %> + <% @site_valid_locales.each do |locale| %>
    <%= f.fields_for :name_translations do |n| %> @@ -26,7 +26,7 @@ <% end %>
    - <% @site_in_use_locales.each do |locale| %> + <% @site_valid_locales.each do |locale| %>
    <%= f.fields_for :external_url_translations do |n| %> From bc95f77f870083a9a41bf94e9691ea564c2ef20d Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 23 Oct 2014 18:32:13 +0800 Subject: [PATCH 12/14] small fix --- app/views/pages/_form_link.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/pages/_form_link.html.erb b/app/views/pages/_form_link.html.erb index bd0c986..3a4cd05 100644 --- a/app/views/pages/_form_link.html.erb +++ b/app/views/pages/_form_link.html.erb @@ -50,7 +50,7 @@
    - <% @site_in_use_locales.each do |locale| %> + <% @site_valid_locales.each do |locale| %>
    - <% @site_valid_locales.each do |locale| %> + <% @site_in_use_locales.each do |locale| %> <%= f.label :locale, "#{t(:title)} #{t(locale)}" %>
    <%= f.fields_for :name_translations do |n| %> @@ -170,7 +170,7 @@
    - <% @site_valid_locales.each do |locale| %> + <% @site_in_use_locales.each do |locale| %>
    - <% @site_valid_locales.each do |locale| %> + <% @site_in_use_locales.each do |locale| %>
    <%= f.fields_for :name_translations do |n| %> @@ -26,7 +26,7 @@ <% end %>
    - <% @site_valid_locales.each do |locale| %> + <% @site_in_use_locales.each do |locale| %>
    <%= f.fields_for :external_url_translations do |n| %> @@ -50,7 +50,7 @@
    - <% @site_valid_locales.each do |locale| %> + <% @site_in_use_locales.each do |locale| %>