From: Sungmin Kim Date: Fri, 28 Nov 2014 08:44:40 +0000 (+0900) Subject: Support compat OS environments X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ee77e90d6de655ca8f895ada7b741da6870f30a;p=sdk%2Ftools%2Fsdk-build.git Support compat OS environments Change-Id: Ia60dbc4277ee4ff827fbdc117a6dfb278fcd3673 --- diff --git a/dibs-web/app/controllers/application_controller.rb b/dibs-web/app/controllers/application_controller.rb index 6027ab4..74ea16d 100644 --- a/dibs-web/app/controllers/application_controller.rb +++ b/dibs-web/app/controllers/application_controller.rb @@ -83,7 +83,7 @@ class ApplicationController < ActionController::Base AND users.email = \"#{email}\"") return group_list else - return nil + return Array.new end end @@ -107,6 +107,13 @@ class ApplicationController < ActionController::Base def generate_xml_header(doc) email = get_user_email + name = "" + if(@current_user) + name = @current_user.name + else + name = "anonymous" + end + group_list = get_group_list(email) if is_admin(email) admin = "TRUE" @@ -117,7 +124,7 @@ class ApplicationController < ActionController::Base doc.Header { doc.UserInfo { doc.Email(email) - doc.Name(@current_user.name) + doc.Name(name) doc.Admin(admin) doc.GroupList { group_list.each { |group| diff --git a/dibs-web/app/controllers/projects_controller.rb b/dibs-web/app/controllers/projects_controller.rb index 7bfe607..8d23b91 100644 --- a/dibs-web/app/controllers/projects_controller.rb +++ b/dibs-web/app/controllers/projects_controller.rb @@ -32,6 +32,7 @@ class ProjectsController < ApplicationController layout :myLayout before_filter :check_login_status + skip_before_filter :check_login_status, :only => [:queryProjectsInfoInDistribution] respond_to :json def myLayout @@ -155,6 +156,10 @@ class ProjectsController < ApplicationController end user_id = get_user_id + if(user_id.nil?) + user_id = 1 + end + projects = Project.find_by_sql("SELECT projects.name AS project_name , projects.ptype AS project_type , projects.id AS project_id diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 28cad2c..6cf0edb 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,5 +1,5 @@ Source : dibs -Version :2.2.9 +Version :2.2.10 Maintainer : taejun ha, jiil hyoun , donghyuk yang , donghee yang , sungmin kim Package : tizen-dibs-test