From fa62c09d872a95a55741a256f4ef6fe93f138a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Thu, 21 Nov 2024 15:20:27 +0100 Subject: [PATCH] #1563 delete_link --- README.md | 18 +++++++++++------- app/views/dmsf/edit.html.erb | 2 +- app/views/dmsf/trash.html.erb | 2 +- .../_revision_actions.html.erb | 11 ++++++----- .../dmsf_files/_version_selector.html.erb | 8 ++++---- assets/images/jstoolbar/bt_dmsf.png | Bin 5216 -> 0 bytes assets/stylesheets/redmine_dmsf.css | 2 +- config/routes.rb | 4 ++-- test/functional/dmsf_controller_test.rb | 4 ++-- 9 files changed, 28 insertions(+), 23 deletions(-) delete mode 100644 assets/images/jstoolbar/bt_dmsf.png diff --git a/README.md b/README.md index 7713fe86..b65eb8a6 100644 --- a/README.md +++ b/README.md @@ -226,20 +226,24 @@ instance is stopped. 5. Initialize/Update database: - `RAILS_ENV=production bundle exec rake redmine:plugins:migrate NAME=redmine_dmsf` + `RAILS_ENV=production bundle exec rake redmine:plugins:migrate NAME=redmine_dmsf` -6. The access rights must be set for web server, e.g.: +6. Install assets + + `RAILS_ENV="production" bundle exec rake assets:precompile` + +7. The access rights must be set for web server, e.g.: `chown -R www-data:www-data plugins/redmine_dmsf`. -7. Restart the web server, e.g.: +8. Restart the web server, e.g.: `systemctl restart apache2` -8. You should configure the plugin via Redmine interface: Administration -> Plugins -> DMSF -> Configure. (You should check and then save the plugin's configuration after each upgrade.) -9. Don't forget to grant permissions for DMSF in Administration -> Roles and permissions -10. Assign DMSF permissions to appropriate roles. -11. There are a few rake tasks: +9. You should configure the plugin via Redmine interface: Administration -> Plugins -> DMSF -> Configure. (You should check and then save the plugin's configuration after each upgrade.) +10. Don't forget to grant permissions for DMSF in Administration -> Roles and permissions +11. Assign DMSF permissions to appropriate roles. +12. There are a few rake tasks: I) To convert documents from the standard Redmine document module diff --git a/app/views/dmsf/edit.html.erb b/app/views/dmsf/edit.html.erb index 1e4c6c88..08855288 100644 --- a/app/views/dmsf/edit.html.erb +++ b/app/views/dmsf/edit.html.erb @@ -125,7 +125,7 @@
<% end %> - <%= link_to l(:label_user_search_add), + <%= link_to sprite_icon('add', l(:label_search_for_watchers), size: 12), new_dmsf_folder_permissions_path(project_id: @project, dmsf_folder_id: @folder), remote: true, method: :get %> diff --git a/app/views/dmsf/trash.html.erb b/app/views/dmsf/trash.html.erb index d6efeb9b..fd051282 100644 --- a/app/views/dmsf/trash.html.erb +++ b/app/views/dmsf/trash.html.erb @@ -22,7 +22,7 @@
<% if @file_delete_allowed %> - <%= link_to sprite_icon('del', l(:label_empty_trash_bin)), empty_trash_path(id: @project), class: 'icon icon-del' %> + <%= delete_link empty_trash_path(id: @project), {}, l(:label_empty_trash_bin) %> <% end %>
diff --git a/app/views/dmsf_context_menus/_revision_actions.html.erb b/app/views/dmsf_context_menus/_revision_actions.html.erb index 44de9aaf..012c7912 100644 --- a/app/views/dmsf_context_menus/_revision_actions.html.erb +++ b/app/views/dmsf_context_menus/_revision_actions.html.erb @@ -30,8 +30,9 @@ obsolete_revision_path(revision), data: { confirm: l(:text_are_you_sure) }, class: 'icon icon-close dmsf-revision-action-button' if file_manipulation_allowed && (revision.workflow == DmsfWorkflow::STATE_APPROVED) %> -<%= link_to sprite_icon('del', l(:button_delete)), - delete_revision_path(revision), - data: { confirm: l(:text_are_you_sure) }, - title: l(:title_delete_revision), - class: 'icon icon-del dmsf-revision-action-button' if file_delete_allowed && (file.dmsf_file_revisions.visible.count > 1) %> +<% if file_delete_allowed && (file.dmsf_file_revisions.visible.count > 1) %> + <%= delete_link delete_revision_path(revision), + { data: { confirm: l(:text_are_you_sure) }, + title: l(:title_delete_revision), + class: 'icon icon-del dmsf-revision-action-button' } %> +<% end %> \ No newline at end of file diff --git a/app/views/dmsf_files/_version_selector.html.erb b/app/views/dmsf_files/_version_selector.html.erb index e5393f3a..940afdf2 100644 --- a/app/views/dmsf_files/_version_selector.html.erb +++ b/app/views/dmsf_files/_version_selector.html.erb @@ -38,9 +38,9 @@ <% minor_version = '' %> <% end %> <%= select_tag select_tag_name_minor, - options_for_select(DmsfUploadHelper::minor_version_select_options, minor_version), - class: 'dmsf-select-version' %> + options_for_select(DmsfUploadHelper::minor_version_select_options, minor_version), + class: 'dmsf-select-version' %> . - <%= select_tag select_tag_name_patch, options_for_select(DmsfUploadHelper::patch_version_select_options, - [h(' '), '']), class: 'dmsf-select-version' %> + <%= select_tag select_tag_name_patch, options_for_select(DmsfUploadHelper::patch_version_select_options, ' '), + class: 'dmsf-select-version' %> <% end %> diff --git a/assets/images/jstoolbar/bt_dmsf.png b/assets/images/jstoolbar/bt_dmsf.png deleted file mode 100644 index 51ef5b195cf5c76001ba3c482a282b5a7ba25a5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5216 zcmeHLX;2f{7H$?n0XM{*k-UIxnxs1mB!PfzLc|0NC>WKYNjeZA3t1rGAR>au;KCCa zKoDU>ol#j_N%>_ji0fiA^q{Jyk`woY@&mX>CIrCYpzOsy*$K1z79WGPRF_Kcb*`-mUSPe~mn0;{`7T+HA^#jvtF&ME>mVuyWz)Ebf5US$xU+C9%IhJbCos%r-l2!2luf=iQW`>_y43Wyxz=A5YmG zWvmy9Nz1naOA@s$$TJ%)&0oiW_S6H$duLpqN;GP;onBXSNOHBXxiP;h^X}zG-w*Y) zI1kocLK>&{UE~ksoO5XFqb4`h-sdLiv@m_+q`^73k&MI3m{)35-IYuGukFgLsBXV1 zUusr&dEUjJ#MXyGjXDSKa(X>lIh=x99TkV10(UMdJ6p6nRqw$MubdJ^32ZZF^uyV? zT_wAdD{(fFYux6ywPoY`Up2klc<=t(J4Mytg@!}D`yMTPZg!%`bj@37e)W{5{Pb|f z3B9$)4sdYi&zBLM|LT5p!>H_g-86B<;!UEmt4m@YBuYzbeyC-4&pSX`8Q>HTIz;(D z>E2Flf5SDnCZA?%dA3_=N_leBQXb2lWnEz?7&9-C^!=7E%#Si^edpa-AD5|&PkT{c zG#ZdzIkW$%Xve@W)5eIz=qazx&8`YqSm*i2eA?#7s#mezyQ|uCdu0Qx|U{n$R-R-9@bhFR?6j{8pqR1(qG_avAh&dvE)ZQF#HX83e5Pw|1M|iN+ z$O!g2_xJ9u63HAx;nlFG525j88a-d9=PX&BjJYf|WXY%W&` zR=zaMC0p3w_iPWpeEE7v>*Z_f1M~x2X8o|OqKax$<+ZEVGHD*Pq~g)u@q^>N9dfP0 zAVF>`q!(5tI$|6N?cX%_e9-I_Q{lAWje;!5iphM}c8{U-dwflm75}85_2-`Ddb;k< z)(f)jhV+JpkBFolR(r~dP8b)=*_*3ydFENNY{{iae8uv?n<+W$TXQ^9uDLE=Cc2q= zWTm5r=~_zuA4zG~ZF_Nz+{%XBk>>=X-r-E7q*Ns8GznzCM2mixKh}*Z>L(WJ%qSFrinh4DpL) z`}1PMc{D!O*~!3BMMnulhyuo_L=j>+UB$p^c%J>30$9?4_1$xK8hA9+MI)M-!9gUAB;U%(A0z{+H2q2L_B;rs6 zP97sxz$%otK^o2`LCd>Dug<678p-8H+LdE_9sSpZ2iSKRQsp9g}Pf8_lF{ULV^ z7)7yIbax3)sSc0n&cLeu)AFKf z&}gL3sF-580v7WSH5E#Z7ot2g*p4Sa$b4J~86o1xh=78lA~Z6N5<;TdBOtb<5gdvTq~cJ`gj#UAi!YObCE_Qbni1a!SRp_S7}(W9u~PL3>Ms-_ehOHvCS+$% zB2mb8_I5O?9Ylpbfz}~1IogS8P6))4CV16lp`*#5!ouo4MF}((XfAX&83HRLGJlCA zf`L^BfKgj&+8g6IQ4}ws97V*aJASg~{gB9syNO32La3R-U^Hz@hj|lD2{us9S!pYO?r`Y~e`f z5e>@_mryiQG#j*mG}&ORHB#Dq8B25+qSgr{l5ik|gFt_XL?@H!B)erGLKuhRFMT;JsS zDh0j@{H?pb$@NtVd=>axcm3bwGWhhugNV^zLDA^zOwN;FZS+;h+jq6U#~J__2Y`-_ zj>g8uy1KfPCr@&@Tpo`X9v+^Tmp3vpl97=im&?=A(#FTfi;IgJ+uC;Q*x~Bx%HeRf zY}vAE)v5~@F7)>HzJC3hzG?U{N~@*du>F7)J@?Un-vF%;Z%=n1Wy*J6=*={#*Lpbs z7|u~2T0m~z0(4Mc!DM;p_i7m!Ew{)Cc3O)L1u)%R{1-GMx1kv|7$dj4Df~Y=%b)&b zg`=L)9=d+Co^!K_*SeavBI&3F*w4sO&KU*vnFQBZ8`M|*HietlWN-bz#arKNM(333 lZS%ugq6f8J#XHv?xL}_?t!eHq?JU#