jro_apps/redmine Commit - r13253:ebde5a5f90b7

Merged r13486 to r13489 and r13492 (#8817)....

Jean-Philippe Lang -

r13253:ebde5a5f90b7

parent child

Context file:

r13253:ebde5a5f90b7

Collapse all files

public/plugin_assets/empty created 644 0 0

NO CONTENT: new file 100644

.gitignore +1 -1

             /.project
             /.loadpath
             /.powrc
             /.rvmrc
             /config/additional_environment.rb
             /config/configuration.yml
             /config/database.yml
             /config/email.yml
             /config/initializers/session_store.rb
             /config/initializers/secret_token.rb
             /coverage
             /db/*.db
             /db/*.sqlite3
             /db/schema.rb
             /files/*
             /lib/redmine/scm/adapters/mercurial/redminehelper.pyc
             /lib/redmine/scm/adapters/mercurial/redminehelper.pyo
             /log/*.log*
             /log/mongrel_debug
             /plugins/*
             !/plugins/README
             /public/dispatch.*
-            /public/plugin_assets
+            /public/plugin_assets/*
             /public/themes/*
             !/public/themes/alternate
             !/public/themes/classic
             !/public/themes/README
             /tmp/*
             /tmp/cache/*
             /tmp/pdf/*
             /tmp/sessions/*
             /tmp/sockets/*
             /tmp/test/*
             /tmp/thumbnails/*
             /vendor/cache
             /vendor/rails
             *.rbc
             /.bundle
             /Gemfile.lock
             /Gemfile.local

.hgignore +1 -1

             syntax: glob
             .project
             .loadpath
             .powrc
             .rvmrc
             config/additional_environment.rb
             config/configuration.yml
             config/database.yml
             config/email.yml
             config/initializers/session_store.rb
             config/initializers/secret_token.rb
             coverage
             db/*.db
             db/*.sqlite3
             db/schema.rb
             files/*
             lib/redmine/scm/adapters/mercurial/redminehelper.pyc
             lib/redmine/scm/adapters/mercurial/redminehelper.pyo
             log/*.log*
             log/mongrel_debug
             public/dispatch.*
-            public/plugin_assets
+            public/plugin_assets/*
             tmp/*
             tmp/cache/*
             tmp/pdf/*
             tmp/sessions/*
             tmp/sockets/*
             tmp/test/*
             tmp/thumbnails/*
             vendor/cache
             vendor/rails
             *.rbc
             .svn/
             .git/
             .bundle
             Gemfile.lock
             Gemfile.local

app/controllers/admin_controller.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2014  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 AdminController < ApplicationController
               layout 'admin'
               menu_item :projects, :only => :projects
               menu_item :plugins, :only => :plugins
               menu_item :info, :only => :info
               before_filter :require_admin
               helper :sort
               include SortHelper
               def index
                 @no_configuration_data = Redmine::DefaultData::Loader::no_data?
               end
               def projects
                 @status = params[:status] || 1
                 scope = Project.status(@status).order('lft')
                 scope = scope.like(params[:name]) if params[:name].present?
                 @projects = scope.all
                 render :action => "projects", :layout => false if request.xhr?
               end
               def plugins
                 @plugins = Redmine::Plugin.all
               end
               # Loads the default configuration
               # (roles, trackers, statuses, workflow, enumerations)
               def default_configuration
                 if request.post?
                   begin
                     Redmine::DefaultData::Loader::load(params[:lang])
                     flash[:notice] = l(:notice_default_data_loaded)
                   rescue Exception => e
                     flash[:error] = l(:error_can_t_load_default_data, e.message)
                   end
                 end
                 redirect_to admin_path
               end
               def test_email
                 raise_delivery_errors = ActionMailer::Base.raise_delivery_errors
                 # Force ActionMailer to raise delivery errors so we can catch it
                 ActionMailer::Base.raise_delivery_errors = true
                 begin
                   @test = Mailer.test_email(User.current).deliver
                   flash[:notice] = l(:notice_email_sent, User.current.mail)
                 rescue Exception => e
                   flash[:error] = l(:notice_email_error, Redmine::CodesetUtil.replace_invalid_utf8(e.message.dup))
                 end
                 ActionMailer::Base.raise_delivery_errors = raise_delivery_errors
                 redirect_to settings_path(:tab => 'notifications')
               end
               def info
                 @db_adapter_name = ActiveRecord::Base.connection.adapter_name
                 @checklist = [
                   [:text_default_administrator_account_changed, User.default_admin_account_changed?],
                   [:text_file_repository_writable, File.writable?(Attachment.storage_path)],
-                  [:text_plugin_assets_writable,   File.writable?(Redmine::Plugin.public_directory)],
+                  ["#{l :text_plugin_assets_writable} (./public/plugin_assets)",   File.writable?(Redmine::Plugin.public_directory)],
                   [:text_rmagick_available,        Object.const_defined?(:Magick)],
                   [:text_convert_available,        Redmine::Thumbnail.convert_available?]
                 ]
               end
             end

app/views/admin/info.html.erb +1 -1

             <h2><%=l(:label_information_plural)%></h2>
             <p><strong><%= Redmine::Info.versioned_name %></strong></p>
             <table class="list">
             <% @checklist.each do |label, result| %>
               <tr class="<%= cycle 'odd', 'even' %>">
-                <td class="name"><%= l(label) %></td>
+                <td class="name"><%= label.is_a?(Symbol) ? l(label) : label %></td>
                 <td class="tick"><%= image_tag((result ? 'true.png' : 'exclamation.png'),
                                                 :style => "vertical-align:bottom;") %></td>
               </tr>
             <% end %>
             </table>
             <br />
             <div class="box">
             <pre><%= Redmine::Info.environment %></pre>
             </div>
             <% html_title(l(:label_information_plural)) -%>

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