Sign. Part 1
This commit is contained in:
28
app.rb
28
app.rb
@@ -330,6 +330,7 @@ get "/prjcreate" do
|
||||
result = cfgs.get_configs
|
||||
@global_list = result[:global]
|
||||
@local_list = result[:local]
|
||||
@old_nopublic = session[:prj_old_nopublic]
|
||||
@error_data = session[:prjcreate_error]
|
||||
session[:prjcreate_error] = nil
|
||||
erb :prjcrt
|
||||
@@ -339,12 +340,13 @@ post "/prjcreate" do
|
||||
session[:prj_old_name] = params["projname"]
|
||||
session[:prj_old_description] = params["description"]
|
||||
session[:prj_old_list] = params["conflist"]
|
||||
session[:prj_old_nopublic] = params["nopublic"]
|
||||
if params["projname"].nil? || params["description"].nil? || params["projname"].strip == "" || params["description"].strip == "" || params["conflist"].nil? || params["conflist"].strip == ""
|
||||
session[:rcpcreate_error] = "Имя проекта, описание и окружение сборки не должны быть пустыми"
|
||||
redirect "/prjcreate"
|
||||
else
|
||||
prj = ProjectsActions.new(cfg.get_projects_path, db)
|
||||
result = prj.create_project(params["projname"], params["description"], params["conflist"])
|
||||
result = prj.create_project(params["projname"], params["description"], params["conflist"], params["nopublic"])
|
||||
if result != 0
|
||||
session[:prjcreate_error] = prj.error
|
||||
redirect "/prjcreate"
|
||||
@@ -352,6 +354,7 @@ post "/prjcreate" do
|
||||
session[:prj_old_name] = nil
|
||||
session[:prj_old_description] = nil
|
||||
session[:prj_old_list] = nil
|
||||
session[:prj_old_nopublic] = nil
|
||||
redirect "/projs"
|
||||
end
|
||||
end
|
||||
@@ -380,6 +383,7 @@ get "/prjedit/:id" do
|
||||
@proj_name = prj_info[:projname]
|
||||
@proj_descr = prj_info[:descr]
|
||||
@proj_id = prj_info[:id]
|
||||
@proj_public = prj_info[:public]
|
||||
repo_lst = repo.getrepos
|
||||
proj_repo_list = prj.get_project_gits(prj_info[:id], repo)
|
||||
@repo_list = repo_lst.reject do |item|
|
||||
@@ -1218,7 +1222,6 @@ post "/prjdelete/:id" do
|
||||
if prj_info.nil?
|
||||
print_error_page(503, "Путь к проектам не существует")
|
||||
else
|
||||
git_info = repo.get_repo_short_info_by_id(params["git_id"].to_i)
|
||||
if params["cancel"].nil? && params["delete"] == "delete" && !params["isdelete"].nil?
|
||||
err = prj.delete_project(params["id"])
|
||||
unless err.nil?
|
||||
@@ -1234,6 +1237,27 @@ post "/prjdelete/:id" do
|
||||
end
|
||||
end
|
||||
|
||||
get "/prjsign/:id" do
|
||||
prj = ProjectsActions.new(cfg.get_projects_path, db)
|
||||
if prj.path.nil?
|
||||
print_error_page(503, "Путь к проектам не существует")
|
||||
else
|
||||
prj_info = prj.get_project(params["id"])
|
||||
if prj_info.nil?
|
||||
print_error_page(503, "Путь к проектам не существует")
|
||||
else
|
||||
gpgKeys = RepoManagerKeys.new(cgf.get_keys_path)
|
||||
if gpgKeys.check_key_exists
|
||||
@page_name = "Подписать проект #{prj_info[:projname]} "
|
||||
@proj_name = prj_info[:projname]
|
||||
@proj_id = params["id"]
|
||||
else
|
||||
erb :gpgerror
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
not_found do
|
||||
status 404
|
||||
@page_name = "Кто-то потерялся"
|
||||
|
||||
Reference in New Issue
Block a user