[webui] merge Webui::Role into Role

It was just a namespace anyway

src/api/app/models/role.rb

@@ -58,6 +58,12 @@ def rolecache
     def get_by_title(title)
       find_by_title(title) or raise NotFound.new("Couldn't find Role '#{title}'")
     end
+    def local_roles
+      Array[ "maintainer", "bugowner", "reviewer", "downloader" , "reader"]
+    end
+    def global_roles
+      Array[ "Admin", "User"]
+    end
   end
 
   def rolecache

src/api/webui/app/controllers/webui/group_controller.rb

@@ -28,7 +28,7 @@ def add
 
   def edit
     required_parameters :group
-    @roles = Webui::Role.global_roles
+    @roles = Role.global_roles
     @members = []
     @displayed_group.person.each do |person |
       user = { 'name' => person.userid }

src/api/webui/app/controllers/webui/package_controller.rb

@@ -174,7 +174,7 @@ def binaries
   def users
     @users = [@project.users, @package.users].flatten.uniq
     @groups = [@project.groups, @package.groups].flatten.uniq
-    @roles = Webui::Role.local_roles
+    @roles = Role.local_roles
   end
 
   def requests
@@ -301,11 +301,11 @@ def set_file_details
   private :set_file_details
 
   def add_person
-    @roles = Webui::Role.local_roles
+    @roles = Role.local_roles
   end
 
   def add_group
-    @roles = Webui::Role.local_roles
+    @roles = Role.local_roles
   end
 
   def rdiff

src/api/webui/app/controllers/webui/project_controller.rb

@@ -119,7 +119,7 @@ def get_filtered_projectlist(filterstring, excludefilter='', opts={})
   def users
     @users = @project.users
     @groups = @project.groups
-    @roles = Webui::Role.local_roles
+    @roles = Role.local_roles
   end
 
   def subprojects

src/api/webui/app/controllers/webui/user_controller.rb

@@ -72,7 +72,7 @@ def save
   end
 
   def edit
-    @roles = Webui::Role.global_roles
+    @roles = Role.global_roles
     @states = State.states
   end
 
@@ -113,7 +113,7 @@ def admin
   end
 
   def save_dialog
-    @roles = Webui::Role.global_roles
+    @roles = Role.global_roles
     render_dialog
   end