view/admin/one_group.xhtml @@ -59,6 +59,7 @@ CREATE TABLE ticket_groups ( id SERIAL, name VARCHAR( 256 ) NOT NULL, description VARCHAR( 4096 ) NOT NULL, + parent_id INTEGER REFERENCES ticket_groups( id ), PRIMARY KEY( id ) ); sql/schema.sql @@ -1,6 +1,14 @@ class AdminController < Ramaze::Controller map '/admin' - layout '/page' + layout '/page' => [ + :index, + :ticket, + :comment, + :comment_view, + :blacklist, + :group, + :backup, + ] include AuthAC helper :sendfile @@ -284,7 +292,7 @@ class AdminController < Ramaze::Controller def group requires_flag 'admin' - @groups = TicketGroup.all + @groups = TicketGroup.root_groups @user = session[ :user ] end @@ -294,9 +302,11 @@ class AdminController < Ramaze::Controller begin name = request[ 'name' ] description = request[ 'description' ] + parent_id = request[ 'parent_id' ].to_i if request[ 'parent_id' ] TicketGroup.create( :name => name, - :description => description + :description => description, + :parent_id => parent_id ) flash[ :success ] = "'#{name}' group added." rescue DBI::Error => e @@ -310,6 +320,11 @@ class AdminController < Ramaze::Controller redirect Rs( :group ) end + def one_group + @group = TicketGroup[ request[ 'group_id' ].to_i ] + @depth = request[ 'depth' ].to_i + end + # ----------------- def backup src/admin.rb @@ -2,7 +2,29 @@ class TicketGroup < DBI::Model( :ticket_groups ) def self.default self[ :name => 'Uncategorized' ] end + + def self.root_groups + TicketGroup.where( :parent_id => nil ) + end + def to_s name end + + def parent + TicketGroup[ parent_id ] + end + + # Provides ancestry in order from parent to furthest ancestor. + def ancestors + if parent_id.nil? + [] + else + [ parent ] + parent.ancestors + end + end + + def children + TicketGroup.where( :parent_id => id ) + end end \ No newline at end of file src/models/ticket-group.rb @@ -5,7 +5,7 @@ Use ticket groups to organize your tickets. Ticket groups can represent projects, project components, categories, or whatever else your needs require. </p> -<table class="list"> +<table class="list sortable"> <tr> <th>Name</th> @@ -13,12 +13,7 @@ projects, project components, categories, or whatever else your needs require. </tr> <?r @groups.each do |group| ?> - -<tr> -<td>#{group.name}</td> -<td>#{group.description}</td> -</tr> - + #{ render_action( :one_group, 'group_id' => group.id ) } <?r end ?> </table> @@ -33,8 +28,19 @@ projects, project components, categories, or whatever else your needs require. <td><input type="text" name="name"/></td> </tr> <tr> + <td>Subgroup of:</td> + <td> + <select name="parent_id"> + <option value="">(none)</option> + <?r @groups.each do |group| ?> + <option value="#{group.id}">#{group.name}</option> + <?r end ?> + </select> + </td> + </tr> + <tr> <td>Description:</td> - <td><input type="text" name="description"/></td> + <td><input type="text" name="description" size="60"/></td> </tr> </table> view/admin/group.xhtml f6926c366bae90730a21ccf767b390530b988d60 Pistos gitsomegrace.5.pistos@geoshell.com http://github.com/Pistos/linistrac/commit/891553f5da22301c15d6af79a8365314121fe6fe 891553f5da22301c15d6af79a8365314121fe6fe 2008-05-01T22:05:26-07:00 2008-05-01T22:05:26-07:00 Added ticket groups hierarchy. Adjusted ticket group admin interface to support the hierarchy. 77360efaf34a2db0e2de609afe4ee150d6eaf394 Pistos gitsomegrace.5.pistos@geoshell.com