From: Andreas Bauer
---
src/webui/app/controllers/package_controller.rb | 4 +-
src/webui/app/controllers/project_controller.rb | 64 ++++++++++----------
src/webui/app/views/layouts/application.rhtml | 2 +-
src/webui/app/views/package/show.rhtml | 2 +-
src/webui/app/views/project/_watch_link.rhtml | 2 +-
src/webui/app/views/project/add_person.rhtml | 2 +-
src/webui/app/views/project/add_target.rhtml | 2 +-
src/webui/app/views/project/list_all.rhtml | 2 +-
src/webui/app/views/project/list_my.rhtml | 17 +++--
src/webui/app/views/project/monitor.rhtml | 4 +-
src/webui/app/views/project/refresh_monitor.rhtml | 2 +-
src/webui/app/views/project/show.rhtml | 14 ++--
12 files changed, 60 insertions(+), 57 deletions(-)
diff --git a/src/webui/app/controllers/package_controller.rb b/src/webui/app/controllers/package_controller.rb
index c02c974..c8b10b5 100644
--- a/src/webui/app/controllers/package_controller.rb
+++ b/src/webui/app/controllers/package_controller.rb
@@ -48,7 +48,7 @@ class PackageController < ApplicationController
redirect_to :action => 'show', :project => params[:project], :package => params[:package]
else
flash[:note] = "Failed to save package '#{@package}'"
- redirect_to :controller => 'project', :action => 'show', :name => params[:project]
+ redirect_to :controller => 'project', :action => 'show', :project => params[:project]
end
else
#show template
@@ -85,7 +85,7 @@ class PackageController < ApplicationController
else
flash[:note] = "Failed to remove package '#{@package_name}' from project '#{@project}'"
end
- redirect_to :controller => 'project', :action => :show, :name => params[:project]
+ redirect_to :controller => 'project', :action => :show, :project => params[:project]
end
def add_file
diff --git a/src/webui/app/controllers/project_controller.rb b/src/webui/app/controllers/project_controller.rb
index 6f6917b..dcbf356 100644
--- a/src/webui/app/controllers/project_controller.rb
+++ b/src/webui/app/controllers/project_controller.rb
@@ -18,16 +18,16 @@ class ProjectController < ApplicationController
def show
@user = Person.find( :login => session[:login] ) if session[:login]
- @project = Project.find( params[:name] )
+ @project = Project.find( params[:project] )
if ( !@project )
- flash[:error] = "Project #{params[:name]} doesn't exist."
+ flash[:error] = "Project #{params[:project]} doesn't exist."
redirect_to :action => list_all
else
@project_name = @project.name
session[:project] = @project.name
begin
- result = Result.find( :project => params[:name] )
+ result = Result.find( :project => params[:project] )
if ( result )
@status = result.status.code
@package_counts = Hash.new
@@ -49,9 +49,9 @@ class ProjectController < ApplicationController
end
def new
- if params[:name]
+ if params[:project]
#store project
- @project = Project.new( :name => params[:name] )
+ @project = Project.new( :name => params[:project] )
@project.title.data.text = params[:title]
@project.description.data.text = params[:description]
@@ -63,25 +63,25 @@ class ProjectController < ApplicationController
flash[:note] = "Failed to save project '#{@project}'"
end
- redirect_to :action => 'show', :name => params[:name]
+ redirect_to :action => 'show', :project => params[:project]
else
#show template
end
end
def edit
- @project = Project.find( params[:name] )
+ @project = Project.find( params[:project] )
session[:project] = @project.name
end
def trigger_rebuild
- @project = Project.find( params[:name] )
+ @project = Project.find( params[:project] )
if @project.save
flash[:note] = "Triggered rebuild"
else
flash[:note] = "Failed to trigger rebuild"
end
- redirect_to :action => 'show', :name => params[:name]
+ redirect_to :action => 'show', :project => params[:project]
end
def save
@@ -89,7 +89,7 @@ class ProjectController < ApplicationController
if ( !params[:title] )
flash[:error] = "Title must not be empty"
- redirect_to :action => 'edit', :name => params[:name]
+ redirect_to :action => 'edit', :project => params[:project]
return
end
@@ -103,12 +103,12 @@ class ProjectController < ApplicationController
end
session[:project] = nil
- redirect_to :action => 'show', :name => @project
+ redirect_to :action => 'show', :project => @project
end
def add_target
@platforms = Platform.find( :all ).map {|p| p.name.to_s}
- @project = Project.find( params[:name] )
+ @project = Project.find( params[:project] )
session[:project] = @project.name
end
@@ -128,16 +128,16 @@ class ProjectController < ApplicationController
flash[:note] = "Failed to add target '#{platform}'"
end
- redirect_to :action => :show, :name => @project
+ redirect_to :action => :show, :project => @project
end
def remove_target
if not params[:target]
flash[:error] = "Target removal failed, no target selected!"
- redirect_to :action => :show, :name => params[:name]
+ redirect_to :action => :show, :project => params[:project]
end
- @project = Project.find( params[:name] )
+ @project = Project.find( params[:project] )
@project.remove_target params[:target]
if @project.save
@@ -146,18 +146,18 @@ class ProjectController < ApplicationController
flash[:note] = "Failed to remove target '#{params[:target]}'"
end
- redirect_to :action => :show, :name => @project
+ redirect_to :action => :show, :project => @project
end
def add_person
- @project = Project.find( params[:name] )
+ @project = Project.find( params[:project] )
session[:project] = @project.name
end
def save_person
if not params[:userid]
flash[:error] = "Login missing"
- redirect_to :action => :add_person, :name => params[:name], :role => params[:role]
+ redirect_to :action => :add_person, :project => params[:project], :role => params[:role]
return
end
@@ -166,7 +166,7 @@ class ProjectController < ApplicationController
if not user
flash[:error] = "Unknown user with id '#{params[:userid]}'"
- redirect_to :action => :add_person, :name => params[:name], :role => params[:role]
+ redirect_to :action => :add_person, :project => params[:project], :role => params[:role]
return
end
@@ -179,16 +179,16 @@ class ProjectController < ApplicationController
flash[:note] = "Failed to add user '#{params[:userid]}'"
end
- redirect_to :action => :show, :name => @project
+ redirect_to :action => :show, :project => @project
end
def remove_person
if not params[:userid]
flash[:note] = "User removal aborted, no user id given!"
- redirect_to :action => :show, :name => params[:name]
+ redirect_to :action => :show, :project => params[:project]
return
end
- @project = Project.find( params[:name] )
+ @project = Project.find( params[:project] )
@project.remove_persons( :userid => params[:userid], :role => params[:role] )
if @project.save
@@ -197,24 +197,24 @@ class ProjectController < ApplicationController
flash[:note] = "Failed to remove user '#{params[:userid]}'"
end
- redirect_to :action => :show, :name => params[:name]
+ redirect_to :action => :show, :project => params[:project]
end
def monitor
- @project = Project.find( params[:name] )
- @projectresult = Result.find( :project => params[:name] )
+ @project = Project.find( params[:project] )
+ @projectresult = Result.find( :project => params[:project] )
@packresults = Hash.new
@repolist = Array.new
@project.each_package do |pack|
@packresults[pack.name] = Hash.new
@project.each_repository do |repo|
- @packresults[pack.name][repo.name] = Result.find( :project => params[:name], :package => pack.name, :platform => repo.name )
+ @packresults[pack.name][repo.name] = Result.find( :project => params[:project], :package => pack.name, :platform => repo.name )
end
end
@repolist = @projectresult.each_repositoryresult
- session[:monitor_project] = params[:name]
+ session[:monitor_project] = params[:project]
session[:monitor_repolist] = @repolist.map {|repo| repo.name}
session[:monitor_packlist] = @packresults.keys
end
@@ -224,7 +224,7 @@ class ProjectController < ApplicationController
session[:monitor_repolist] and
session[:monitor_project]
- @name = session[:monitor_project]
+ @project = session[:monitor_project]
@status = Hash.new
session[:monitor_packlist].each do |pack|
session[:monitor_repolist].each do |platform|
@@ -263,9 +263,9 @@ class ProjectController < ApplicationController
#filters
def check_params
- logger.debug "Checking parameter #{params[:name]}"
- if params[:name]
- unless params[:name] =~ /^\w[-\w]*$/
+ logger.debug "Checking parameter #{params[:project]}"
+ if params[:project]
+ unless params[:project] =~ /^\w[-_\w]*$/
flash[:error] = "Invalid project name, may only contain alphanumeric characters"
redirect_to :action => :new
end
@@ -273,7 +273,7 @@ class ProjectController < ApplicationController
end
def list_all_if_no_name
- unless params[:name]
+ unless params[:project]
flash[:note] = "Please select a project"
redirect_to :action => :list_all
end
diff --git a/src/webui/app/views/layouts/application.rhtml b/src/webui/app/views/layouts/application.rhtml
index 406cdc7..6a07f19 100644
--- a/src/webui/app/views/layouts/application.rhtml
+++ b/src/webui/app/views/layouts/application.rhtml
@@ -34,7 +34,7 @@
<% end %>
<%= link_to_if @project, @project, :controller => "project",
:action => :show,
- :name => @project %>
+ :project => @project %>
</div>
<div id="loginlinks">
<% if logged_in? %>
diff --git a/src/webui/app/views/package/show.rhtml b/src/webui/app/views/package/show.rhtml
index a26f76b..c32e7a4 100644
--- a/src/webui/app/views/package/show.rhtml
+++ b/src/webui/app/views/package/show.rhtml
@@ -98,5 +98,5 @@
<% end %>
<p>
-<%= link_to "Back to Project '#{@project}'", :controller => 'project', :action => :show, :name => @project %>
+<%= link_to "Back to Project '#{@project}'", :controller => 'project', :action => :show, :project => @project %>
</p>
diff --git a/src/webui/app/views/project/_watch_link.rhtml b/src/webui/app/views/project/_watch_link.rhtml
index 2c85c1e..762052a 100644
--- a/src/webui/app/views/project/_watch_link.rhtml
+++ b/src/webui/app/views/project/_watch_link.rhtml
@@ -1,4 +1,4 @@
<%= link_to_remote watch_link_text,
:update => 'watchlink',
-:url => {:action => :toggle_watch, :name => @project_name}
+:url => {:action => :toggle_watch, :project => @project_name}
%>
diff --git a/src/webui/app/views/project/add_person.rhtml b/src/webui/app/views/project/add_person.rhtml
index efede04..3757891 100644
--- a/src/webui/app/views/project/add_person.rhtml
+++ b/src/webui/app/views/project/add_person.rhtml
@@ -5,6 +5,6 @@
<%= text_field_tag 'userid', params[:userid] %><br/>
<b>Role:</b><br/>
<%= select_tag 'role', options_for_select(%w{maintainer}, params[:role]) %>
-<%= hidden_field_tag 'name', @project %>
+<%= hidden_field_tag 'project', @project %>
<p><%= submit_tag %></p>
<%= end_form_tag %>
diff --git a/src/webui/app/views/project/add_target.rhtml b/src/webui/app/views/project/add_target.rhtml
index 58f1d72..5952ff4 100644
--- a/src/webui/app/views/project/add_target.rhtml
+++ b/src/webui/app/views/project/add_target.rhtml
@@ -9,6 +9,6 @@
<% [:i586, :x86_64].each do |arch| %>
<%= check_box_tag "arch[#{arch}]", "", arch == :i586 %><%=arch%><br>
<% end %>
-<%= hidden_field_tag 'name', @project %>
+<%= hidden_field_tag 'project', @project %>
<p><%= submit_tag %></p>
<%= end_form_tag %>
diff --git a/src/webui/app/views/project/list_all.rhtml b/src/webui/app/views/project/list_all.rhtml
index 231cf7a..4383546 100644
--- a/src/webui/app/views/project/list_all.rhtml
+++ b/src/webui/app/views/project/list_all.rhtml
@@ -2,7 +2,7 @@
<ul>
<% for project in @projects %>
-<li><%= link_to project, :action => :show, :name => project %></li>
+<li><%= link_to project, :action => :show, :project => project %></li>
<% end %>
</ul>
diff --git a/src/webui/app/views/project/list_my.rhtml b/src/webui/app/views/project/list_my.rhtml
index ca52f3d..64785cb 100644
--- a/src/webui/app/views/project/list_my.rhtml
+++ b/src/webui/app/views/project/list_my.rhtml
@@ -1,12 +1,15 @@
-<h2>All Projects</h2>
-
-<% for project in @projects -%>
-<%= link_to project, :action => :show, :name => project %><br/>
-<% end -%>
-<br/>
<h2>My Watched Projects</h2>
+
<% if @watchlist -%>
<% @watchlist.each_project do |project| -%>
-<%= link_to project, :action => :show, :name => project %><br/>
+<%= link_to project, :action => :show, :project => project %><br/>
<% end -%>
<% end -%>
+
+<h2>All Projects</h2>
+
+<% for project in @projects -%>
+<%= link_to project, :action => :show, :project => project %><br/>
+<% end -%>
+<br/>
+
diff --git a/src/webui/app/views/project/monitor.rhtml b/src/webui/app/views/project/monitor.rhtml
index d63fc15..7e2d663 100644
--- a/src/webui/app/views/project/monitor.rhtml
+++ b/src/webui/app/views/project/monitor.rhtml
@@ -41,10 +41,10 @@
<div id="start_link">
<%= link_to_remote( "[Start Refreshing]",
- :url => {:action => :refresh_monitor, :name => params[:name]},
+ :url => {:action => :refresh_monitor, :project => params[:project]},
:after => "new Effect.Fade('start_link')",
:complete => evaluate_remote_response )%>
</div>
</p>
-<%= link_to "[Back to #{@project}]", :action => :show, :name => @project %>
+<%= link_to "[Back to #{@project}]", :action => :show, :project => @project %>
diff --git a/src/webui/app/views/project/refresh_monitor.rhtml b/src/webui/app/views/project/refresh_monitor.rhtml
index eeadd21..5af4c09 100644
--- a/src/webui/app/views/project/refresh_monitor.rhtml
+++ b/src/webui/app/views/project/refresh_monitor.rhtml
@@ -10,6 +10,6 @@ if( $("<%= id %>").innerHTML != "<%= st %>" ) {
<%= update_element_function "refresh_date", :content => "Updated at: #{DateTime.now}" -%>
<%= remote_function(
- :url => {:action => :refresh_monitor, :name => @name},
+:url => {:action => :refresh_monitor, :project => @project},
:complete => evaluate_remote_response )
%>
diff --git a/src/webui/app/views/project/show.rhtml b/src/webui/app/views/project/show.rhtml
index f1e562c..454317f 100644
--- a/src/webui/app/views/project/show.rhtml
+++ b/src/webui/app/views/project/show.rhtml
@@ -10,14 +10,14 @@
<b>Title:</b> <%= @project.title %><br/>
<b>Description:</b><br/>
<%= @project.description %><br/>
-<%= link_to "[Edit Project Information]", :action => 'edit', :name => @project %>
-<%= link_to "[Trigger Rebuild]", :action => 'trigger_rebuild', :name=> @project %>
+<%= link_to "[Edit Project Information]", :action => 'edit', :project => @project %>
+<%= link_to "[Trigger Rebuild]", :action => 'trigger_rebuild', :project => @project %>
</p>
<% logger.debug "<-- finished rendering project information" -%>
<p>
<b>Targets:</b> <%= link_to "[Add Target]", :action => 'add_target',
- :name => @project %>
+ :project => @project %>
<% if @project.has_element? :repository -%>
<table border="1">
@@ -33,7 +33,7 @@
<td></td>
<td></td>
<td><%= link_to "[Remove Target]", :action => :remove_target,
- :name => params[:name],
+ :project => params[:project],
:target => repository.name %></td>
</tr>
<% repository.each_arch do |arch| -%>
@@ -63,7 +63,7 @@
<% end -%>
<p><%= link_to "[Monitor Build Status]", :action => :monitor,
- :name => params[:name] %></p>
+ :project => params[:project] %></p>
<% logger.debug "--> starting to render users" -%>
<p>
@@ -84,7 +84,7 @@
<%- if @project.each_person.length > 1 %>
<td>
<%= link_to "[Remove User]", :action => :remove_person,
- :name => params[:name], :userid => person.userid,
+ :project => params[:project], :userid => person.userid,
:role => person.role%>
</td>
@@ -96,7 +96,7 @@
<b>No one in this project</b>
<% end #if has_element? person -%>
</p><p>
-<%= link_to "[Add User]", :action => :add_person, :name => params[:name] %>
+<%= link_to "[Add User]", :action => :add_person, :project => params[:project] %>
</p>
<% logger.debug "--> starting to render packages" -%>
--
1.7.7
--
To unsubscribe, e-mail: obs-commits+unsubscribe@opensuse.org
To contact the owner, e-mail: obs-commits+owner@opensuse.org
