jro_apps/redmine Commit - r10698:85b5b1c7f007

1

# Redmine - project management software

1

# Redmine - project management software

2

3

#

3

#

4

# This program is free software; you can redistribute it and/or

4

# This program is free software; you can redistribute it and/or

5

# modify it under the terms of the GNU General Public License

5

# modify it under the terms of the GNU General Public License

6

# as published by the Free Software Foundation; either version 2

6

# as published by the Free Software Foundation; either version 2

7

# of the License, or (at your option) any later version.

7

# of the License, or (at your option) any later version.

8

#

8

#

9

# This program is distributed in the hope that it will be useful,

9

# This program is distributed in the hope that it will be useful,

10

# but WITHOUT ANY WARRANTY; without even the implied warranty of

10

# but WITHOUT ANY WARRANTY; without even the implied warranty of

11

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

12

# GNU General Public License for more details.

12

# GNU General Public License for more details.

13

#

13

#

14

# You should have received a copy of the GNU General Public License

14

# You should have received a copy of the GNU General Public License

15

# along with this program; if not, write to the Free Software

15

# along with this program; if not, write to the Free Software

16

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

16

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

17

18

class FilesController < ApplicationController

18

class FilesController < ApplicationController

19

menu_item :files

19

menu_item :files

20

21

before_filter :find_project_by_project_id

21

before_filter :find_project_by_project_id

22

before_filter :authorize

22

before_filter :authorize

23

24

helper :sort

24

helper :sort

25

include SortHelper

25

include SortHelper

26

27

def index

27

def index

28

sort_init 'filename', 'asc'

28

sort_init 'filename', 'asc'

29

sort_update 'filename' => "#{Attachment.table_name}.filename",

29

sort_update 'filename' => "#{Attachment.table_name}.filename",

30

'created_on' => "#{Attachment.table_name}.created_on",

30

'created_on' => "#{Attachment.table_name}.created_on",

31

'size' => "#{Attachment.table_name}.filesize",

31

'size' => "#{Attachment.table_name}.filesize",

32

'downloads' => "#{Attachment.table_name}.downloads"

32

'downloads' => "#{Attachment.table_name}.downloads"

33

34

@containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)]

34

@containers = [ Project.includes(:attachments).reorder(sort_clause).find(@project.id)]

35

@containers += @project.versions.find(~~:all~~, ~~:include~~ => :attachments, ~~:order~~ => sort_clause).sort.reverse

35

@containers += @project.versions.includes(:attachments).reorder(sort_clause).all.sort.reverse

36

render :layout => !request.xhr?

36

render :layout => !request.xhr?

37

end

37

end

38

39

def new

39

def new

40

@versions = @project.versions.sort

40

@versions = @project.versions.sort

41

end

41

end

42

43

def create

43

def create

44

container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))

44

container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))

45

attachments = Attachment.attach_files(container, params[:attachments])

45

attachments = Attachment.attach_files(container, params[:attachments])

46

render_attachment_warning_if_needed(container)

46

render_attachment_warning_if_needed(container)

47

48

if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')

48

if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')

49

Mailer.attachments_added(attachments[:files]).deliver

49

Mailer.attachments_added(attachments[:files]).deliver

50

end

50

end

51

redirect_to project_files_path(@project)

51

redirect_to project_files_path(@project)

52

end

52

end

53

end

53

end

	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

             # Redmine - project management software
             # Copyright (C) 2006-2012  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
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class FilesController < ApplicationController
               menu_item :files
               before_filter :find_project_by_project_id
               before_filter :authorize
               helper :sort
               include SortHelper
               def index
                 sort_init 'filename', 'asc'
                 sort_update 'filename' => "#{Attachment.table_name}.filename",
                             'created_on' => "#{Attachment.table_name}.created_on",
                             'size' => "#{Attachment.table_name}.filesize",
                             'downloads' => "#{Attachment.table_name}.downloads"
-                @containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)]
+                @containers = [ Project.includes(:attachments).reorder(sort_clause).find(@project.id)]
-                @containers += @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
+                @containers += @project.versions.includes(:attachments).reorder(sort_clause).all.sort.reverse
                 render :layout => !request.xhr?
               end
               def new
                 @versions = @project.versions.sort
               end
               def create
                 container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
                 attachments = Attachment.attach_files(container, params[:attachments])
                 render_attachment_warning_if_needed(container)
                 if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
                   Mailer.attachments_added(attachments[:files]).deliver
                 end
                 redirect_to project_files_path(@project)
               end
             end