diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-03-16 18:26:43 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-03-16 18:26:43 +0000 |
| commit | 23131d14f5ed86cac904a695df34dbcd011ecdd0 (patch) | |
| tree | c8ea06e8c1ff39aa718ec0b1e85ada741cfd0249 /app/views/my | |
| parent | 4cfd5133733a08ebf5ba89aa3994e4a86679c809 (diff) | |
| download | redmine-23131d14f5ed86cac904a695df34dbcd011ecdd0.tar.gz redmine-23131d14f5ed86cac904a695df34dbcd011ecdd0.zip | |
Use helper methods for rendering blocks.
git-svn-id: http://svn.redmine.org/redmine/trunk@16414 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/my')
| -rw-r--r-- | app/views/my/blocks/_calendar.html.erb | 3 | ||||
| -rw-r--r-- | app/views/my/blocks/_documents.html.erb | 2 | ||||
| -rw-r--r-- | app/views/my/blocks/_news.html.erb | 2 | ||||
| -rw-r--r-- | app/views/my/blocks/_timelog.html.erb | 5 |
4 files changed, 2 insertions, 10 deletions
diff --git a/app/views/my/blocks/_calendar.html.erb b/app/views/my/blocks/_calendar.html.erb index 89dde0e01..c85190f2a 100644 --- a/app/views/my/blocks/_calendar.html.erb +++ b/app/views/my/blocks/_calendar.html.erb @@ -1,6 +1,3 @@ <h3><%= l(:label_calendar) %></h3> -<% calendar = Redmine::Helpers::Calendar.new(User.current.today, current_language, :week) - calendar.events = calendar_items(calendar.startdt, calendar.enddt) %> - <%= render :partial => 'common/calendar', :locals => {:calendar => calendar } %> diff --git a/app/views/my/blocks/_documents.html.erb b/app/views/my/blocks/_documents.html.erb index a55094cf1..560adca1e 100644 --- a/app/views/my/blocks/_documents.html.erb +++ b/app/views/my/blocks/_documents.html.erb @@ -1,3 +1,3 @@ <h3><%=l(:label_document_plural)%></h3> -<%= render :partial => 'documents/document', :collection => documents_items %> +<%= render :partial => 'documents/document', :collection => documents %> diff --git a/app/views/my/blocks/_news.html.erb b/app/views/my/blocks/_news.html.erb index c478e4196..62a618617 100644 --- a/app/views/my/blocks/_news.html.erb +++ b/app/views/my/blocks/_news.html.erb @@ -1,3 +1,3 @@ <h3><%=l(:label_news_latest)%></h3> -<%= render :partial => 'news/news', :collection => news_items %> +<%= render :partial => 'news/news', :collection => news %> diff --git a/app/views/my/blocks/_timelog.html.erb b/app/views/my/blocks/_timelog.html.erb index 83716d35e..da181c27e 100644 --- a/app/views/my/blocks/_timelog.html.erb +++ b/app/views/my/blocks/_timelog.html.erb @@ -1,8 +1,3 @@ -<% -entries, days = timelog_items(settings) -entries_by_day = entries.group_by(&:spent_on) -%> - <div class="contextual"> <%= link_to_function l(:label_options), "$('#timelog-settings').toggle();", :class => 'icon-only icon-settings', :title => l(:label_options) %> </div> |