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

#1144 Who has locked the document

Browse Source
This commit is contained in:
karel.picman@lbcfree.net 2020-07-10 14:30:02 +02:00
parent 2384ff7cf7
commit 5866765564
19 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/dmsf_file.rb
View File

@ -128,6 +128,16 @@ class DmsfFile < ActiveRecord::Base
deleted == STATUS_DELETED
end
def locked_by
if lock && lock.reverse[0]
user = lock.reverse[0].user
if user
return (user == User.current) ? l(:label_me) : user.name
end
end
''
end
def delete(commit)
if locked_for_user? && (!User.current.allowed_to?(:force_file_unlock, project))
Rails.logger.info l(:error_file_is_locked)

1
app/views/dmsf_context_menus/_file.html.erb
View File

@ -40,6 +40,7 @@
<li>
<% if locked %>
<%= context_menu_link l(:button_unlock), unlock_dmsf_files_path(id: dmsf_file), class: 'icon icon-unlock',
title: l(:title_locked_by_user, user: dmsf_file.locked_by),
disabled: !allowed || !unlockable %>
<% else %>
<%= context_menu_link l(:button_lock), lock_dmsf_files_path(id: dmsf_file), class: 'icon icon-lock',

1
config/locales/cs.yml
View File

@ -80,7 +80,6 @@ cs:
title_notifications_not_active_activate: "Notifikace nejsou aktivní: Aktivovat"
title_title_version_version_download: "%{title} verze %{version} stáhnout"
title_locked_by_user: "Zamčeno uživatelem %{user}"
title_locked_by_you: Zamčeno Vámi
title_waiting_for_approval: Čeká na schválení
title_approved: Schváleno
title_unlock_file: Odemknout a umožnit změny ostatním uživatelům

1
config/locales/de.yml
View File

@ -80,7 +80,6 @@ de:
title_notifications_not_active_activate: "Benachrichtigungen sind nicht aktiv: Einschalten"
title_title_version_version_download: "%{title} Version %{version} Download"
title_locked_by_user: "Gesperrt von %{user}"
title_locked_by_you: Gesperrt von dir
title_waiting_for_approval: Warte auf Zustimmung
title_approved: Zugestimmt
title_unlock_file: Hebe Sperre auf um Änderungen anderer Nutzer zu ermöglichen

1
config/locales/en.yml
View File

@ -80,7 +80,6 @@ en:
title_notifications_not_active_activate: "Notifications not active: Activate"
title_title_version_version_download: "%{title} version %{version} download"
title_locked_by_user: "Locked by %{user}"
title_locked_by_you: Locked by you
title_waiting_for_approval: Waiting for Approval
title_approved: Approved
title_unlock_file: Unlock to allow changes for other members

1
config/locales/es.yml
View File

@ -80,7 +80,6 @@ es:
title_notifications_not_active_activate: "Notificacciones No Activas: Activadas"
title_title_version_version_download: "%{title} version %{version} descargar"
title_locked_by_user: "bloqueado por %{user}"
title_locked_by_you: Bloqueado por ti
title_waiting_for_approval: Esperando Aprobación
title_approved: Aprobado
title_unlock_file: Desbloquear para que otros miembros puedan editarlo

1
config/locales/fr.yml
View File

@ -80,7 +80,6 @@ fr:
title_notifications_not_active_activate: "Notifications désactivées : cliquer pour activer"
title_title_version_version_download: "Télécharger la version %{version} de %{title}"
title_locked_by_user: "Verrouillé par %{user}"
title_locked_by_you: Verrouillé par vous-même
title_waiting_for_approval: Attente de validation
title_approved: Validé
title_unlock_file: Déverrouiller afin de permettre la modification par les membres du projet

1
config/locales/hu.yml
View File

@ -80,7 +80,6 @@ hu:
title_notifications_not_active_activate: "Értesítések nincsnek bekapcsolva: Bekapcsolás"
title_title_version_version_download: "%{title} verzió %{version} letöltés"
title_locked_by_user: "Zárolva %{user}"
title_locked_by_you: Ön zárolta
title_waiting_for_approval: Elfogadásra vár
title_approved: Elfogadva
title_unlock_file: Zárolás megszüntetése, hogy más felhasználók is változtatni tudjanak

1
config/locales/it.yml
View File

@ -80,7 +80,6 @@ it: # Italian strings thx 2 Matteo Arceci!
title_notifications_not_active_activate: "Notifiche disattivate: Attiva"
title_title_version_version_download: "%{title} versione %{version} download"
title_locked_by_user: "Bloccato da %{user}"
title_locked_by_you: Bloccato da te
title_waiting_for_approval: In attesa di Approvazione
title_approved: Approvato
title_unlock_file: Sblocca per consentire modifiche degli altri membri

1
config/locales/ja.yml
View File

@ -80,7 +80,6 @@ ja:
title_notifications_not_active_activate: "通知は無効です: 有効にする"
title_title_version_version_download: "%{title} のバージョン %{version} をダウンロードする"
title_locked_by_user: "%{user} によってロックされています"
title_locked_by_you: あなたがロックしています
title_waiting_for_approval: 承認待ち
title_approved: 承認済み
title_unlock_file: ロック解除して他のメンバーの変更を許可する

1
config/locales/ko.yml
View File

@ -80,7 +80,6 @@ ko:
title_notifications_not_active_activate: "알림 비활성화: 활성화"
title_title_version_version_download: "%{title} 버전 %{version} 다운로드"
title_locked_by_user: "%{user} 에 의해 잠겨짐"
title_locked_by_you: 사용자에 의해 잠겨짐
title_waiting_for_approval: 승인을 기다리는 중
title_approved: 승인됨
title_unlock_file: 다른 구성원들의 변경 허가 잠금 해제

1
config/locales/nl.yml
View File

@ -80,7 +80,6 @@ nl:
title_notifications_not_active_activate: "Notificaties niet actief: Activeren"
title_title_version_version_download: "%{title} versie %{version} downloaden"
title_locked_by_user: "Vergrendeld door %{user}"
title_locked_by_you: Vergrendeld door u
title_waiting_for_approval: Wacht op goedkeuring
title_approved: Goedgekeurd
title_unlock_file: Ontgrendel om wijzigingen door andere leden toe te staan

1
config/locales/pl.yml
View File

@ -80,7 +80,6 @@ pl:
title_notifications_not_active_activate: "Powiadomienia wyłączone: Aktywuj"
title_title_version_version_download: "pobierz %{title} wersja %{version}"
title_locked_by_user: "Zablokowany przez %{user}"
title_locked_by_you: Zablokowany przez Ciebie
title_waiting_for_approval: Oczekiwanie na akceptację
title_approved: Zaakceptowany
title_unlock_file: Odblokuj aby umożliwić wprowadzanie zmian innym użytkownikom

1
config/locales/pt-BR.yml
View File

@ -80,7 +80,6 @@ pt-BR:
title_notifications_not_active_activate: "Notificações não ativas: Ativar"
title_title_version_version_download: "%{title} revisão %{version} download"
title_locked_by_user: "Bloqueado por %{user}"
title_locked_by_you: Bloqueado por você
title_waiting_for_approval: Aguardando aprovação
title_approved: Aprovado
title_unlock_file: Clique aqui para permitir alterações por outro usuário

1
config/locales/ru.yml
View File

@ -80,7 +80,6 @@ ru:
title_notifications_not_active_activate: "Уведомления не включены: Включить"
title_title_version_version_download: "Скачать %{title} редакции %{version}"
title_locked_by_user: "Заблокировано пользователем %{user}"
title_locked_by_you: Заблокировано Вами
title_waiting_for_approval: Ожидается утверждение
title_approved: Утверждено
title_unlock_file: Разблокируйте файл, чтобы разрешить его изменение другими участниками

1
config/locales/sl.yml
View File

@ -80,7 +80,6 @@ sl:
title_notifications_not_active_activate: "Obveščanje ni aktivno: Aktiviraj"
title_title_version_version_download: "%{title} verzija %{version} prenesi dol"
title_locked_by_user: "Zaklenil %{user}"
title_locked_by_you: Zaklenili ste
title_waiting_for_approval: V postopku odobritve
title_approved: Odobreno
title_unlock_file: Odkleni drugim članom za posodabljanje

1
config/locales/zh-TW.yml
View File

@ -80,7 +80,6 @@ zh-TW:
title_notifications_not_active_activate: "通知關閉中: 點擊啟用通知"
title_title_version_version_download: " 版本: %{version} 檔案: %{title} 下載"
title_locked_by_user: "被使用者%{user}，鎖定了。"
title_locked_by_you: 被您鎖定了。
title_waiting_for_approval: 等待批准
title_approved: 已經被批准
title_unlock_file: 解除鎖定。允許其它使用者修改。

1
config/locales/zh.yml
View File

@ -80,7 +80,6 @@ zh:
title_notifications_not_active_activate: "通知无效:点击激活通知"
title_title_version_version_download: " 下载‘%{title}’版本‘%{version}’"
title_locked_by_user: "%{user}锁定"
title_locked_by_you: 您锁定
title_waiting_for_approval: 待批准
title_approved: 已批准
title_unlock_file: 解除锁定允许其他成员修改

7
test/unit/dmsf_file_test.rb
View File

@ -291,4 +291,11 @@ class DmsfFileTest < RedmineDmsf::Test::UnitTest
assert @file7.assigned?(@jsmith)
end
def test_locked_by
# Locked file
assert_equal @jsmith.name, @file2.locked_by
# Unlocked file
assert_equal '', @file1.locked_by
end
end