redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Approval workflow log view texts changed

Browse Source
This commit is contained in:
Karel Picman 2014-01-03 11:57:38 +01:00
parent 0baa2c7430
commit 7fbe3e29d6
12 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/dmsf_files/show.html.erb
View File

@ -110,7 +110,7 @@
<%= label_tag('', "#{l(:label_version)}:") %>
<%= revision.major_version %>.<%= revision.minor_version %>
<br/>
<%= label_tag('', "#{l(:label_workflow)}:") %>
<%= label_tag('', "#{l(:link_workflow)}:") %>
<% wf = DmsfWorkflow.find_by_id(revision.dmsf_workflow_id) %>
<% if wf %>
<%= "#{wf.name} - " %>

2
app/views/dmsf_workflows/_assign.html.erb
View File

@ -22,7 +22,7 @@
:id => 'assignment-form') do %>
<%= hidden_field_tag :dmsf_file_revision_id, params[:dmsf_file_revision_id] %>
<p>
<%= label_tag('workflow', l(:label_workflow) + ':') %>
<%= label_tag('workflow', "#{l(:link_workflow)}:") %>
<%= select_tag(
'dmsf_workflow_id',
dmsf_workflows_for_select(@project, nil))%>

14
app/views/dmsf_workflows/_log.html.erb
View File

@ -37,9 +37,9 @@
<th><%= l(:label_dmsf_workflow_step) %></th>
<th><%= l(:label_user) %> </th>
<th><%= l(:label_action) %></th>
<th><%= l(:label_workflow) %></th>
<th><%= l(:link_workflow) %></th>
<th><%= l(:label_note) %></th>
<th><%= l(:label_date)%></th>
<th><%= l(:label_date)%></th>
</tr></thead>
<tbody>
<tr id="step-0" class="even">
@ -53,7 +53,7 @@
<tr id="step-1" class="odd">
<td class="step"></td>
<td><%= link_to_user User.find_by_id(revision.dmsf_workflow_assigned_by) if revision.dmsf_workflow_assigned_by %></td>
<td><%= DmsfWorkflowStepAction.action_str(DmsfWorkflowStepAction::ACTION_ASSIGN) %></td>
<td><%= DmsfWorkflowStepAction.action_str(DmsfWorkflowStepAction::ACTION_ASSIGN) %></td>
<td><%= DmsfWorkflowStepAction.workflow_str(DmsfWorkflowStepAction::ACTION_ASSIGN) %></td>
<td class="note"></td>
<td><%= format_time(revision.dmsf_workflow_assigned_at) if revision.dmsf_workflow_assigned_at %></td>
@ -61,7 +61,7 @@
<tr id="step-2" class="even">
<td class="step"></td>
<td><%= link_to_user User.find_by_id(revision.dmsf_workflow_started_by) if revision.dmsf_workflow_started_by %></td>
<td><%= DmsfWorkflowStepAction.action_str(DmsfWorkflowStepAction::ACTION_START) %></td>
<td><%= DmsfWorkflowStepAction.action_str(DmsfWorkflowStepAction::ACTION_START) %></td>
<td><%= DmsfWorkflowStepAction.workflow_str(DmsfWorkflowStepAction::ACTION_START) if revision.dmsf_workflow_started_by %></td>
<td class="note"></td>
<td><%= format_time(revision.dmsf_workflow_started_at) if revision.dmsf_workflow_started_at %></td>
@ -73,10 +73,8 @@
<td class="step"><%= row[5] %></td>
<td><%= link_to_user User.find_by_id(row[3].present? ? row[3] : row[4]) %></td>
<td><%= DmsfWorkflowStepAction.action_str(row[0]) %></td>
<td>
<% s = @workflow.dmsf_workflow_steps.last.step %>
<% s1 = row[5] %>
<% if((row[5].to_i == @workflow.dmsf_workflow_steps.last.step) && (revision.workflow == DmsfWorkflow::STATE_APPROVED)) %>
<td>
<% if((row[5].to_i == @workflow.dmsf_workflow_steps.last.step) && (revision.workflow == DmsfWorkflow::STATE_APPROVED) && (row[0] != DmsfWorkflowStepAction::ACTION_DELEGATE)) %>
<%= l(:title_approved) %>
<% else %>
<%= DmsfWorkflowStepAction.workflow_str(row[0]) %>

3
config/locales/cs.yml
View File

@ -111,8 +111,7 @@ cs:
label_changed: Změněno
info_changed_by_user: "%{changed} uživatelem"
label_filename: Jméno souboru
label_version: Verze
label_workflow: Workflow
label_version: Verze
label_mime: Typ
label_size: Velikost
label_comment: Komentář

3
config/locales/de.yml
View File

@ -111,8 +111,7 @@ de:
label_changed: Geändert
info_changed_by_user: "%{changed} von"
label_filename: Dateiname
label_version: Version
label_workflow: Workflow
label_version: Version
label_mime: Mime
label_size: Größe
label_comment: Kommentar

5
config/locales/en.yml
View File

@ -113,7 +113,7 @@ en:
info_changed_by_user: "%{changed} by"
label_filename: Filename
label_version: Version
label_workflow: Workflow
label_approval_workflow: Workflow
label_mime: Mime
label_size: Size
label_comment: Comment
@ -258,8 +258,7 @@ en:
dmsf_or: OR
dmsf_new_step: New step
message_dmsf_wokflow_note: Your note...
info_revision: "r%{rev}"
link_workflow: Workflow
info_revision: "r%{rev}"
notice_workflow_started: Approval workflow successfully started
text_email_subject_approved: "Approval workflow %{name} approved"
text_email_subject_rejected: "Approval workflow %{name} rejected"

3
config/locales/es.yml
View File

@ -112,8 +112,7 @@ es:
label_changed: Changed
info_changed_by_user: "%{changed} by"
label_filename: Filename
label_version: Version
label_workflow: Workflow
label_version: Version
label_mime: Mime
label_size: Size
label_comment: Comment

3
config/locales/fr.yml
View File

@ -110,8 +110,7 @@ fr:
label_changed: Modifié
info_changed_by_user: "%{changed} par"
label_filename: Fichier
label_version: Version
label_workflow: Etat
label_version: Version
label_mime: Type
label_size: Taille
label_comment: Commentaires

3
config/locales/ja.yml
View File

@ -110,8 +110,7 @@ ja:
label_changed: 更新者/日時
info_changed_by_user: "/ %{changed}"
label_filename: ファイル名
label_version: バージョン
label_workflow: ワークフロー
label_version: バージョン
label_mime: Mime
label_size: サイズ
label_comment: コメント

3
config/locales/ru.yml
View File

@ -110,8 +110,7 @@ ru:
label_changed: Изменен
info_changed_by_user: "%{changed} пользователем"
label_filename: Имя файла
label_version: Версия
label_workflow: Поток работ
label_version: Версия
label_mime: MIME-тип
label_size: Размер
label_comment: Комментарий

3
config/locales/sl.yml
View File

@ -110,8 +110,7 @@ sl:
label_changed: Spremenjeno
info_changed_by_user: "%{changed} po"
label_filename: Datoteka
label_version: Verzija
label_workflow: postopek
label_version: Verzija
label_mime: Mime
label_size: Velikost
label_comment: Komentar

3
config/locales/zh.yml
View File

@ -110,8 +110,7 @@ zh:
label_changed: 修改
info_changed_by_user: "%{changed} by"
label_filename: 文件名
label_version: 版本
label_workflow: 工作流程
label_version: 版本
label_mime: Mime
label_size: 大小
label_comment: 注释