[Title] Dibs web - remove reslove command

diff --git a/dibs-web/app/controllers/projects_controller.rb b/dibs-web/app/controllers/projects_controller.rb
index 64796f3c355e4a0f39c9536d5f4e8d354a5a7388..947b5e0973a4d196575aa9c53b71920e00967e74 100644 (file)
--- a/dibs-web/app/controllers/projects_controller.rb
+++ b/dibs-web/app/controllers/projects_controller.rb
@@ -48,11 +48,9 @@ class ProjectsController < ApplicationController
        password_list = []
 
        dist_name = nil
-       build_type = nil
 
        change_group_list.each do |change_item|
                dist_name = change_item[:distribution]
-               build_type = change_item[:buildType]
                project_name = change_item[:projectName]
                os = change_item[:os]
 
@@ -71,7 +69,7 @@ class ProjectsController < ApplicationController
        if (project_list.length > 1) or (not (project_list[0].nil? or project_list[0].empty?))
                # execute build command
                begin
-                       Utils.sbi_build_command(build_type, dist_name, project_list, os_list, password_list, get_user_email)
+                       Utils.sbi_build_command(dist_name, project_list, os_list, password_list, get_user_email)
                rescue => e
                        render :text => e.message, :status => 406
                        return

diff --git a/dibs-web/app/controllers/utils.rb b/dibs-web/app/controllers/utils.rb
index 32f332e4398a03bcdcaf79a21bad5492d14dfb66..92c9826b53230ccd1f6df482fa83643c77f0c4cd 100644 (file)
--- a/dibs-web/app/controllers/utils.rb
+++ b/dibs-web/app/controllers/utils.rb
@@ -30,7 +30,7 @@ Contributors:
 BUILD_SERVER_ADDRESS = "127.0.0.1"
 
 class Utils < ApplicationController
-  def Utils.sbi_build_command(sub_cmd, distribution, project_list, os_list, password_list, email)
+  def Utils.sbi_build_command(distribution, project_list, os_list, password_list, email)
        dibs_path = File.dirname(File.dirname(File.dirname(File.dirname(__FILE__))))
        dibs_config = Server_config.find(:first, :conditions => ["property = \"port\""])
        if dibs_config.nil?
@@ -51,7 +51,7 @@ class Utils < ApplicationController
                options = options + " -U #{email} "
        end
 
-       cmd = "#{dibs_path}/build-cli #{sub_cmd} #{options}"
+       cmd = "#{dibs_path}/build-cli build #{options}"
 puts "Build command"
 puts "[[[#{cmd}]]]"
 

diff --git a/dibs-web/public/index.html b/dibs-web/public/index.html
index 76ba4e122f961543b7eda0ba505054ec747ca1a6..fc7f9a5fd613ae83bdc1669c89aebd7cca0e93df 100644 (file)
--- a/dibs-web/public/index.html
+++ b/dibs-web/public/index.html
@@ -195,7 +195,6 @@ Contributors:
                                        <h3>Git project</h3>
                                        <div align="right" style="font-size: 10px">
                                                <a href="#" data-role="button" data-inline="true" data-mini="true" onClick='buildBuildProject("build")'>Build</a>
-                                               <a href="#" data-role="button" data-inline="true" data-mini="true" onClick='buildBuildProject("resolve")'>Resolve</a>
                                        </div>
                                        <div data-role="content">
                                                <table class="build-project-table" style="font-size: 14px" id="build-git-table">

diff --git a/dibs-web/public/javascripts/build.js b/dibs-web/public/javascripts/build.js
index bb213a89e3597904b69253a6a8d2436a62fc71db..f204833721813323af13abadc77fd58b079b0178 100644 (file)
--- a/dibs-web/public/javascripts/build.js
+++ b/dibs-web/public/javascripts/build.js
@@ -273,7 +273,7 @@ function buildAddBinaryTableRow(binaryProjectList, otherProjectList) {
        });
 }
 
-function buildBuildProject(type) {
+function buildBuildProject() {
        var distName = $("#build-distribution-select option:selected").val();
        var buildProjectList = [];
 
@@ -287,7 +287,7 @@ function buildBuildProject(type) {
                                if (node.getAttribute('name') != "all-checkbox") {
                                        var prjName = node.id.split(":")[1];
                                        var osName = node.id.split(":")[2];
-                                       var buildData = { "distribution":distName, "buildType":type, "projectName" : prjName, "os" : osName };
+                                       var buildData = { "distribution":distName, "projectName" : prjName, "os" : osName };
                                        buildProjectList.push(buildData);
                                }
                        }