jro_apps/redmine Commit - r563:1c44600c62dc

Added per user custom queries....

Jean-Philippe Lang -

r563:1c44600c62dc

parent child

Context file:

r563:1c44600c62dc

Collapse all files

app/views/queries/index.rhtml created 644 +29 0

@@ -0,0 +1,29
	1	<div class="contextual">
	2	<% if loggedin? %>
	3	<%= link_to l(:label_query_new), {:controller => 'queries', :action => 'new', :project_id => @project}, :class => 'icon icon-add' %>
	4	<% end %>
	5	</div>
	6
	7	<h2><%= l(:label_query_plural) %></h2>
	8
	9	<% if @queries.empty? %>
	10	<p><i><%=l(:label_no_data)%></i></p>
	11	<% else %>
	12	<table class="list">
	13	<% @queries.each do \|query\| %>
	14	<tr class="<%= cycle('odd', 'even') %>">
	15	<td>
	16	<%= link_to query.name, :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => query %>
	17	</td>
	18	<td align="right">
	19	<small>
	20	<% if query.editable_by?(@logged_in_user) %>
	21	<%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => query}, :class => 'icon icon-edit' %>
	22	<%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
	23	</small>
	24	<% end %>
	25	</td>
	26	</tr>
	27	<% end %>
	28	</table>
	29	<% end %>

app/views/queries/new.rhtml created 644 +6 0

@@ -0,0 +1,6
	1	<h2><%= l(:label_query_new) %></h2>
	2
	3	<% form_tag({:action => 'new', :project_id => @query.project}) do %>
	4	<%= render :partial => 'form', :locals => {:query => @query} %>
	5	<%= submit_tag l(:button_save) %>
	6	<% end %>

app/controllers/projects_controller.rb 0 -17

@@ -289,7 +289,6 class ProjectsController < ApplicationController
289	:limit => @issue_pages.items_per_page,	289	:limit => @issue_pages.items_per_page,
290	:offset => @issue_pages.current.offset	290	:offset => @issue_pages.current.offset
291	end	291	end
292	@trackers = Tracker.find :all, :order => 'position'
293	render :layout => false if request.xhr?	292	render :layout => false if request.xhr?
294	end	293	end
295		294
@@ -400,22 +399,6 class ProjectsController < ApplicationController
400	end	399	end
401	end	400	end
402		401
403	def add_query
404	@query = Query.new(params[:query])
405	@query.project = @project
406	@query.user = logged_in_user
407
408	params[:fields].each do \|field\|
409	@query.add_filter(field, params[:operators][field], params[:values][field])
410	end if params[:fields]
411
412	if request.post? and @query.save
413	flash[:notice] = l(:notice_successful_create)
414	redirect_to :controller => 'reports', :action => 'issue_report', :id => @project
415	end
416	render :layout => false if request.xhr?
417	end
418
419	# Add a news to @project	402	# Add a news to @project
420	def add_news	403	def add_news
421	@news = News.new(:project => @project)	404	@news = News.new(:project => @project)

app/controllers/queries_controller.rb +36 -6

             # redMine - project management software
-            # Copyright (C) 2006  Jean-Philippe Lang
+            # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             class QueriesController < ApplicationController
               layout 'base'
-              before_filter :require_login, :find_query
+              before_filter :require_login, :except => :index
+              before_filter :find_project, :check_project_privacy
+              def index
+                @queries = @project.queries.find(:all,
+                                                 :order => "name ASC",
+                                                 :conditions => ["is_public = ? or user_id = ?", true, (logged_in_user ? logged_in_user.id : 0)])
+              end
+              def new
+                @query = Query.new(params[:query])
+                @query.project = @project
+                @query.user = logged_in_user
+                @query.executed_by = logged_in_user
+                @query.is_public = false unless logged_in_user.authorized_to(@project, 'projects/add_query')
+                params[:fields].each do |field|
+                  @query.add_filter(field, params[:operators][field], params[:values][field])
+                end if params[:fields]
+                if request.post? and @query.save
+                  flash[:notice] = l(:notice_successful_create)
+                  redirect_to :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => @query
+                  return
+                end
+                render :layout => false if request.xhr?
+              end
               def edit
                 if request.post?
                     @query.add_filter(field, params[:operators][field], params[:values][field])
                   end if params[:fields]
                   @query.attributes = params[:query]
+                  @query.is_public = false unless logged_in_user.authorized_to(@project, 'projects/add_query')
                   if @query.save
                     flash[:notice] = l(:notice_successful_update)
               def destroy
                 @query.destroy if request.post?
-                redirect_to :controller => 'reports', :action => 'issue_report', :id => @project
+                redirect_to :controller => 'queries', :project_id => @project
               end
             private
-              def find_query
+              def find_project
+                if params[:id]
                   @query = Query.find(params[:id])
                   @query.executed_by = logged_in_user
                   @project = @query.project
-                # check if user is allowed to manage queries (same permission as add_query)
+                  render_403 unless @query.editable_by?(logged_in_user)
-                authorize('projects', 'add_query')
+                else
+                  @project = Project.find(params[:project_id])
+                end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end

app/controllers/reports_controller.rb 0 -1

                   @report_title = l(:field_subproject)
                   render :template => "reports/issue_report_details"
                 else
-                  @queries = @project.queries.find :all, :conditions => ["is_public=? or user_id=?", true, (logged_in_user ? logged_in_user.id : 0)]
                   @trackers = Tracker.find(:all, :order => 'position')
                   @versions = @project.versions.sort
                   @priorities = Enumeration::get_values('IPRI')

app/models/query.rb +6 -1

               def initialize(attributes = nil)
                 super attributes
                 self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
-                self.is_public = true
               end
               def executed_by=(user)
                 end if filters
               end
+              def editable_by?(user)
+                return false unless user
+                return true if !is_public && self.user_id == user.id
+                is_public && user.authorized_to(project, "projects/add_query")
+              end
               def available_filters
                 return @available_filters if @available_filters
                 @available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },

app/models/user.rb +7 0

               end
               def role_for_project(project)
+                return nil unless project
                 member = memberships.detect {|m| m.project_id == project.id}
                 member ? member.role : nil
               end
+              def authorized_to(project, action)
+                return true if self.admin?
+                role = role_for_project(project)
+                role && Permission.allowed_to_role(action, role)
+              end
               def pref
                 self.preference ||= UserPreference.new(:user => self)
               end

app/views/layouts/base.rhtml +11 0

                     <%= link_to l(:label_calendar), {:controller => 'projects', :action => 'calendar', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_gantt), {:controller => 'projects', :action => 'gantt', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_issue_plural), {:controller => 'projects', :action => 'list_issues', :id => @project }, :class => "menuItem" %>
+                    <% if @project && authorize_for('projects', 'add_issue') %>
+                      <a class="menuItem" href="#" onmouseover="menuItemMouseover(event,'menuNewIssue');" onclick="this.blur(); return false;"><span class="menuItemText"><%= l(:label_issue_new) %></span><span class="menuItemArrow">&#9654;</span></a>
+                    <% end %>
                     <%= link_to l(:label_report_plural), {:controller => 'reports', :action => 'issue_report', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_activity), {:controller => 'projects', :action => 'activity', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_news_plural), {:controller => 'projects', :action => 'list_news', :id => @project }, :class => "menuItem" %>
                 </div>
                 <% end %>
+                <% if @project && authorize_for('projects', 'add_issue') %>
+                    <div id="menuNewIssue" class="menu" onmouseover="menuMouseover(event)">
+                    <% Tracker.find(:all, :order => 'position').each do |tracker| %>
+                        <%= link_to tracker.name, {:controller => 'projects', :action => 'add_issue', :id => @project, :tracker_id => tracker}, :class => "menuItem" %>
+                    <% end %>
+                    </div>
+                <% end %>
                 <% if loggedin? and @logged_in_user.memberships.any? %>
                     <div id="menuAllProjects" class="menu" onmouseover="menuMouseover(event)">
                     <%= link_to l(:label_project_all), {:controller => 'projects' }, :class => "menuItem" %>

app/views/projects/list_issues.rhtml +5 -9

             <% if @query.new_record? %>
                 <div class="contextual">
-                <%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %>
+                  <%= link_to l(:label_query_plural), :controller => 'queries', :project_id => @project %>
                 </div>
                 <h2><%=l(:label_issue_plural)%></h2>
                                      :update => "content",
                                    }, :class => 'icon icon-reload'  %>
-                <% if authorize_for('projects', 'add_query') %>
+                <% if loggedin? %>
                 <%= link_to_remote l(:button_save),
-                                   { :url => { :controller => 'projects', :action => "add_query", :id => @project },
+                                   { :url => { :controller => 'queries', :action => 'new', :project_id => @project },
                                      :method => 'get',
                                      :update => "content",
                                      :with => "Form.serialize('query_form')"
                 <br />
             <% else %>
                 <div class="contextual">
-                    <%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %>
+                    <%= link_to l(:label_query_plural), {:controller => 'queries', :project_id => @project} %> |
-                    <%= link_to l(:button_clear), {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1}, :class => 'icon icon-reload' %>
+                    <%= link_to l(:label_issue_view_all), {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1} %>
-                    <% if authorize_for('projects', 'add_query') %>
-                        <%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %>
-                        <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
-                    <% end %>
                 </div>
                 <h2><%= @query.name %></h2>
             <% end %>

app/views/projects/show.rhtml 0 -3

             	</ul>
               <div class="box">
-                <div class="contextual">
-                <%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %>
-                </div>
                 <h3 class="icon22 icon22-tracker"><%=l(:label_issue_tracking)%></h3>
                 <ul>
                 <% for tracker in @trackers %>

app/views/queries/_filters.rhtml +1 -1

             //]]>
             </script>
-            <fieldset style="margin:0;"><legend><%= l(:label_filter_plural) %></legend>
+            <fieldset><legend><%= l(:label_filter_plural) %></legend>
             <table width="100%">
             <tr>
             <td>

app/views/queries/_form.rhtml +5 -2

             <%= error_messages_for 'query' %>
-            <!--[form:query]-->
             <div class="box">
             <div class="tabular">
             <p><label for="query_name"><%=l(:field_name)%></label>
             <%= text_field 'query', 'name', :size => 80 %></p>
+            <% if authorize_for('projects', 'add_query') %>
+              <p><label for="query_is_public"><%=l(:field_is_public)%></label>
+              <%= check_box 'query', 'is_public' %></p>
+            <% end %>
             </div>
             <%= render :partial => 'queries/filters', :locals => {:query => query}%>
             </div>
-            <!--[eoform:query]-->
  No newline at end of file

app/views/queries/edit.rhtml 0 0

NO CONTENT: modified file

app/views/reports/issue_report.rhtml 0 -17

@@ -1,27 +1,10
1	<h2><%=l(:label_report_plural)%></h2>	1	<h2><%=l(:label_report_plural)%></h2>
2		2
3	<div class="splitcontentleft">
4	<div class="contextual">
5	<%= link_to_if_authorized l(:label_query_new), {:controller => 'projects', :action => 'add_query', :id => @project}, :class => 'icon icon-add' %>
6	</div>
7	<h3><%= l(:label_query_plural) %></h3>
8
9	<% if @queries.empty? %><p><i><%=l(:label_no_data)%></i></p><% end %>
10	<ul>
11	<% @queries.each do \|query\| %>
12	<li><%= link_to query.name, :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => query %></li>
13	<% end %>
14	</ul>
15	</div>
16	<div class="splitcontentright">
17	<% if @total_hours %>	3	<% if @total_hours %>
18	<h3 class="textright"><%= l(:label_spent_time) %>:	4	<h3 class="textright"><%= l(:label_spent_time) %>:
19	<%= link_to(lwr(:label_f_hour, @total_hours), {:controller => 'timelog', :action => 'details', :project_id => @project}, :class => 'icon icon-time') %>	5	<%= link_to(lwr(:label_f_hour, @total_hours), {:controller => 'timelog', :action => 'details', :project_id => @project}, :class => 'icon icon-time') %>
20	</h3>	6	</h3>
21	<% end %>	7	<% end %>
22	</div>
23
24	<div class="clear"></div>
25		8
26	<div class="splitcontentleft">	9	<div class="splitcontentleft">
27	<h3><%=l(:field_tracker)%>  <%= link_to image_tag('zoom_in.png'), :detail => 'tracker' %></h3>	10	<h3><%=l(:field_tracker)%>  <%= link_to image_tag('zoom_in.png'), :detail => 'tracker' %></h3>

public/images/save.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

app/views/issues/_add_shortcut.rhtml removed 0 -5

NO CONTENT: file was removed

app/views/projects/add_query.rhtml removed 0 -6

NO CONTENT: file was removed

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages