Added projects. Part 2
This commit is contained in:
25
app.rb
25
app.rb
@@ -16,6 +16,7 @@ require_relative "classes/db"
|
||||
require_relative "classes/systeminfo"
|
||||
require_relative "classes/utilities"
|
||||
require_relative "classes/projects"
|
||||
require_relative "classes/configs"
|
||||
|
||||
def print_error_page(error_status, error_meaasge)
|
||||
@page_name = "Ошибка выполнения"
|
||||
@@ -271,11 +272,11 @@ end
|
||||
|
||||
get "/bldcfg" do
|
||||
@page_name = "Список конфигураций сборки"
|
||||
hide_list = cfg.get_configs_hide
|
||||
select_list = cfg.get_configs_selected
|
||||
@list_global = Dir["/etc/mock/*.cfg"].map { |item| [File.dirname(item), File.basename(item, ".cfg"), item] }.reject { |item| check_partname_in_array(item[1], hide_list) }
|
||||
@list_local = Dir["~/.config/mock/*.cfg"].map { |item| [File.dirname(item), File.basename(item, ".cfg"), item] }
|
||||
@list_selected = (@list_global + @list_local).select { |item| check_partname_in_array(item[1], select_list) }
|
||||
cfgs = ConfigsList.new(cfg)
|
||||
result = cfgs.get_configs
|
||||
@list_global = result[:global]
|
||||
@list_local = result[:local]
|
||||
@list_selected = result[:selected]
|
||||
erb :cfgslist
|
||||
end
|
||||
|
||||
@@ -301,6 +302,20 @@ get "/projs" do
|
||||
end
|
||||
end
|
||||
|
||||
get "/prjcreate" do
|
||||
@page_name = "Создать новый проект"
|
||||
@old_name = session[:prj_old_name]
|
||||
@old_description = session[:prj_old_description]
|
||||
@old_list = session[:prj_old_list]
|
||||
cfgs = ConfigsList.new(cfg)
|
||||
result = cfgs.get_configs
|
||||
@global_list = result[:global]
|
||||
@local_list = result[:local]
|
||||
@error_data = session[:prjcreate_error]
|
||||
session[:prjcreate_error] = nil
|
||||
erb :prjcrt
|
||||
end
|
||||
|
||||
not_found do
|
||||
status 404
|
||||
@page_name = "Кто-то потерялся"
|
||||
|
||||
Reference in New Issue
Block a user