Added fixes

This commit is contained in:
alexey
2025-03-20 00:37:19 +03:00
parent ad1bbe1d2d
commit a57d0a0f15
11 changed files with 117 additions and 21 deletions

24
app.rb
View File

@@ -266,7 +266,8 @@ post "/rcpcreate" do
session[:rcpcreate_error] = "Имя рецепта и описание не должны быть пустыми"
redirect "/rcpcreate"
else
@error_data = db.createrecip(params["filepath"], params["description"], params["codedata"], params["gitlst"])
codedata = params["codedata"].gsub(/\r$/, "")
@error_data = db.createrecip(params["filepath"], params["description"], codedata, params["gitlst"])
unless @error_data.nil?
session[:rcpcreate_error] = @error_data
redirect "/rcpcreate"
@@ -837,8 +838,6 @@ get "/gitpackages/:git_id" do
@page = params["p"].to_i
if @page < 1
@page = 1
else
@page = @page + 1
end
end
if rpms_lst.nil?
@@ -846,6 +845,9 @@ get "/gitpackages/:git_id" do
end
items_per_page = cfg.get_items_per_page
@rpms_list = rpms_lst[(@page - 1) * items_per_page, items_per_page]
if @rpms_list.nil?
@rpms_list = []
end
@max_pages = rpms_lst.length / items_per_page
if (@max_pages * items_per_page) != rpms_lst.length
@max_pages = @max_pages + 1
@@ -886,8 +888,6 @@ get "/builds" do
@page = params["p"].to_i
if @page < 1
@page = 1
else
@page = @page + 1
end
end
if builds_lst.nil?
@@ -895,6 +895,9 @@ get "/builds" do
end
items_per_page = cfg.get_items_per_page
@builds_list = builds_lst[(@page - 1) * items_per_page, items_per_page]
if @builds_list.nil?
@builds_list = []
end
@max_pages = builds_lst.length / items_per_page
if (@max_pages * items_per_page) != builds_lst.length
@max_pages = @max_pages + 1
@@ -968,8 +971,6 @@ get "/prjbuilds/:id" do
@page = params["p"].to_i
if @page < 1
@page = 1
else
@page = @page + 1
end
end
if builds_lst.nil?
@@ -977,6 +978,9 @@ get "/prjbuilds/:id" do
end
items_per_page = cfg.get_items_per_page
@builds_list = builds_lst[(@page - 1) * items_per_page, items_per_page]
if @builds_list.nil?
@builds_list = []
end
@max_pages = builds_lst.length / items_per_page
if (@max_pages * items_per_page) != builds_lst.length
@max_pages = @max_pages + 1
@@ -1159,6 +1163,7 @@ get "/prjgitbld/:id/:git_id" do
git_info = repo.get_repo_short_info_by_id(params["git_id"].to_i)
@git_data = git_info
@prj = prj_info
@git_id = params["git_id"]
@page_name = "Список всех сборок для проекта #{prj_info[:projname]} и репозитория #{git_info[:reponame]}"
builds_lst = db.get_builds_for_project_git(params["id"], params["git_id"])
if params["p"].nil?
@@ -1167,8 +1172,6 @@ get "/prjgitbld/:id/:git_id" do
@page = params["p"].to_i
if @page < 1
@page = 1
else
@page = @page + 1
end
end
if builds_lst.nil?
@@ -1176,6 +1179,9 @@ get "/prjgitbld/:id/:git_id" do
end
items_per_page = cfg.get_items_per_page
@builds_list = builds_lst[(@page - 1) * items_per_page, items_per_page]
if @builds_list.nil?
@builds_list = []
end
@max_pages = builds_lst.length / items_per_page
if (@max_pages * items_per_page) != builds_lst.length
@max_pages = @max_pages + 1