From ef332c071d3ac830319923a5dd7eefc84ef342df Mon Sep 17 00:00:00 2001
From: "karel.picman@lbcfree.net" <karel.picman@lbcfree.net>
Date: Tue, 9 Feb 2021 14:46:24 +0100
Subject: [PATCH] #1206 Support for .xlsm

---
 app/models/dmsf_file_revision.rb    |   1 +
 assets/images/filetypes/docx.png    | Bin 671 -> 0 bytes
 assets/images/filetypes/xlsx.png    | Bin 744 -> 0 bytes
 assets/stylesheets/redmine_dmsf.css |   3 ++-
 4 files changed, 3 insertions(+), 1 deletion(-)
 delete mode 100644 assets/images/filetypes/docx.png
 delete mode 100644 assets/images/filetypes/xlsx.png

diff --git a/app/models/dmsf_file_revision.rb b/app/models/dmsf_file_revision.rb
index 22cdbb71..66f01560 100644
--- a/app/models/dmsf_file_revision.rb
+++ b/app/models/dmsf_file_revision.rb
@@ -49,6 +49,7 @@ class DmsfFileRevision < ActiveRecord::Base
     'application/vnd.oasis.opendocument.spreadsheet' => 'ms-excel',
     'application/vnd.oasis.opendocument.text' => 'ms-word',
     'application/vnd.oasis.opendocument.presentation' => 'ms-powerpoint',
+    'application/vnd.ms-excel.sheet.macroEnabled.12' => 'ms-exel'
   }.freeze
 
   scope :visible, -> { where(deleted: STATUS_ACTIVE) }
diff --git a/assets/images/filetypes/docx.png b/assets/images/filetypes/docx.png
deleted file mode 100644
index 8cca68cd195aefc21978dbc5798f6c7c23feb424..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 671
zcmV;Q0$}}#P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D00001b5ch_0Itp)
z=>Px$EKp2TMgIW*0Wx?fK5Ymuiv>1<2t0@eLYoOovLQ^GI$D@ATed1<w>V+0I%&8~
zYNtSEv_xvTRc)kQb*pE7vqEmfNp#Focgj_J&R>1QSbouWikxnazjBbja*@Awlf8PC
zyL*+qewVscfXG>a##n;IU4+D5gv4Nh&0&bcVu{0Lio$1$!D)=aY>vQZiq&_K)qI!O
zf||UAoxX#d+JK(sh@ilWqQZ=#!i%Kck*CI&tjUnB)}67<iKXe2tLCG&(W$%Ct-8>!
zyx*$6@vp$xv%}iA$n?q5;?~^i(&GBm<NDU*`q$<A+~V}v=KI^{``qaJ-s$_`>ipsC
z{NwHX<?j6E@BHZS{p#`k>+=2W^ZoDi{qXYo@b>=l_x|+w{`L9(_xk?%`~Uy{|8ts|
zXaE2J0d!JMQvg8b*k%9#00Cl4M??UK1szBL000SaNLh0L01FcU01FcV0GgZ_00007
zbV*G`2ipY`6C4vl$S~&s007@fL_t&-(>;#YRsul`K!Xf36v4#;Dn$lVte|uqSqmt2
zfd$sCAo>4)U<2xX%f06$0RVWsyS=%-D&?evCH2|Qbn^Z6A(4!(R|^-JozSN5T_PDB
ze-UrCuuZj=PdC#>up(Y10R<z!ZD>YdSG+u1<B^0cX0-=*#na$44<%%9LtAIw737vu
zLvs(p81y_bc8@N*n}axPp>y?<ts%0JQiFaJ{C{U1cJKGj!6$^^oV%FARI1lKrPs@g
z{nWdiV-iJctd?}zha__Uz1>QYxJ)GCvB=rU(ZPN)IS1}vG!Q*g!jAv|002ovPDHLk
FV1m<fR0jY6

diff --git a/assets/images/filetypes/xlsx.png b/assets/images/filetypes/xlsx.png
deleted file mode 100644
index 0f227dc1c814a917f91a3a01b9d1baecfa6b18a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 744
zcmV<E0vG*>P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D00001b5ch_0Itp)
z=>Px$bWluGMgIW*HAxyYO&K*!7&KBBG*cHeSQRv06Et2FHC`GsX%91P4m52JG-DAo
zWD+)G8#`zoI&U5`a1A+d9y)g!Ja->Hdmb`qC_8Z?I(;WUeIa0eTta{)MuaR!g)Ksf
zHAjd$O^h~AjyXt@KU0%HQkO_rm`7TgNm!mzUYJ#1p;KF;Sa6$dVWL!Fpjc(6TW6|Y
zWT;?itzv4dWo@u$bfs`^j=yq{zjBekc9Xq&mAiYDyndIuRe;D@fyP*Z#a)ENUWCM9
zh{Ixu!)1!XXN$pUjKOS<z=E2*g`K{KsfCcei=42Vp|hWepumfw!i=KAk*CI&tjUnB
z)}67<qqfnhyVR4yj+4ZVmc)^o#+I+Z*t5ghz|p|W+RM+~&(`AB-|64d;`-F%`qt$7
z*X8@!=KI^{``qaJ-s$`0?B(F<{Ne2U<L&(A?)>KO{OIug>hb;S^8M}e{qOYs@b>=l
z_x|+w{`L9(_xk?%`~Uy{|6sFZxBvhE0d!JMQvg8b*k%9#00Cl4M??UK1szBL000Sa
zNLh0L01FcU01FcV0GgZ_00007bV*G`2ipY`6CDmX)op(O007`gL_t&-(_>&@V2B9|
z4G9YL_q4HLfPm<#%8K%`(h{3$kcf$qzLvU*qMVFau}w8d#H1Pugo=OyKoOI0L)Gdy
zO-&!}LK_fZFvyB9mN(T?NZ=~S&&$oRVbHCPkJ6SDkFDkf@w06h)T+HTBDE!S5;^jM
zgR?WO7?iw41^K;|1$^0n@|hWy46+~_yo5QWS#pAdGt$i&q+r%E1Lf1x+!;iKc)0l3
z*;ttvGlPTEQe8n#4*;7Fl21)>1_}7(<px7QO0pwJz!NT?oMZ<Q@UXVFv@mmXadNP?
awFLkXFGfd1A`4#t0000<MNUMnLSTa3(_AtD

diff --git a/assets/stylesheets/redmine_dmsf.css b/assets/stylesheets/redmine_dmsf.css
index d884d278..3a1f3a0f 100644
--- a/assets/stylesheets/redmine_dmsf.css
+++ b/assets/stylesheets/redmine_dmsf.css
@@ -150,7 +150,7 @@ div[id*="revision_access_"] {
 .dmsf-system .icon-folder { background-image: url(../images/folder_system.png); }
 
 .icon-file.filetype-doc, .icon-file.filetype-docx { background-image: url(../images/filetypes/doc.png); }
-.icon-file.filetype-xls, .icon-file.filetype-xlsx { background-image: url(../images/filetypes/xls.png); }
+.icon-file.filetype-xls, .icon-file.filetype-xlsx, .icon-file.filetype-xlsm { background-image: url(../images/filetypes/xls.png); }
 .icon-file.filetype-ppt, .icon-file.filetype-pptx { background-image: url(../images/filetypes/ppt.png); }
 .icon-file.filetype-vsd, .icon-file.filetype-vsdx { background-image: url(../images/filetypes/vsd.png); }
 .icon-file.filetype-mpp { background-image: url(../images/filetypes/mpp.png); }
@@ -164,6 +164,7 @@ div[id*="revision_access_"] {
 .dmsf-gray .icon-file.filetype-docx { background-image: url(../images/filetypes/doc_gray.png); }
 .dmsf-gray .icon-file.filetype-xls { background-image: url(../images/filetypes/xls_gray.png); }
 .dmsf-gray .icon-file.filetype-xlsx { background-image: url(../images/filetypes/xls_gray.png); }
+.dmsf-gray .icon-file.filetype-xlsm { background-image: url(../images/filetypes/xls_gray.png); }
 .dmsf-gray .icon-file.filetype-ppt { background-image: url(../images/filetypes/ppt_gray.png); }
 .dmsf-gray .icon-file.filetype-pptx { background-image: url(../images/filetypes/ppt_gray.png); }
 .dmsf-gray .icon-file.filetype-vsd { background-image: url(../images/filetypes/vsd_gray.png); }