From 730632e2eb9dc1b04cfecf057b95abc98cdf3f87 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 11 May 2020 22:57:55 -0700 Subject: [PATCH] Apply PR #8043 to develop Signed-off-by: snipe --- app/Http/Controllers/Api/ImportController.php | 9 ++++++++- public/js/build/app.js | Bin 445491 -> 446430 bytes public/js/dist/all.js | Bin 814248 -> 815187 bytes public/mix-manifest.json | 4 ++-- .../js/components/importer/importer-file.vue | 19 ++++++++++++++---- .../passport/PersonalAccessTokens.vue | 8 ++++---- 6 files changed, 29 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/Api/ImportController.php b/app/Http/Controllers/Api/ImportController.php index 5b9bcf6b75..2f88e3f474 100644 --- a/app/Http/Controllers/Api/ImportController.php +++ b/app/Http/Controllers/Api/ImportController.php @@ -118,8 +118,15 @@ class ImportController extends Controller public function process(ItemImportRequest $request, $import_id) { $this->authorize('import'); + // Run a backup immediately before processing - Artisan::call('backup:run'); + if ($request->has('run-backup')) { + \Log::debug('Backup manually requested via importer'); + Artisan::call('backup:run'); + } else { + \Log::debug('NO BACKUP requested via importer'); + } + $errors = $request->import(Import::find($import_id)); $redirectTo = "hardware.index"; switch ($request->get('import-type')) { diff --git a/public/js/build/app.js b/public/js/build/app.js index e26879cb067d3a1a385a5eaac806daa75fa2deee..f62c6449c118d18fb1ffaed8ad2aff997eff6e1d 100644 GIT binary patch delta 2675 zcmZ`*eNa@_6`yzSrqqhqjWFBu%8nQDld+Dy`!rnW|%Oj9$awu!b?W9+$Ti!)9C*|X=| z^E>CfbAIpK*WEt)M#t!`a8h@6@`gA`4WF?ak`W%Cc^>}%CG)VPc5lsU9R(t3W?igg zbhj*;k^|b=_2Y(s$IUla!SBm$*??(mYlid3Z8zqE=?^z$Fip>o?;dq4O@hC!+e-nq z>-Nw=p#1!9D=0Z%#YO_6@V*a&IQh?^GbELr%a<(3(AgmaC-MjRl7b|a=T4RGp%I2| zo3GntZI$-=qJZWLHuwXk%ivQAC4&rCb!S7sZ~EPSZyl|Ae{Y|3RsyB@fRqQ~^fPhifCLZ17IjFAC4-&lkWPRoKPWjsY&t0AfanoI<#!HB zlc8L0IV^R?MC7lTnQvw9Zl-ghCgo14$EDf?06fc3|4(|s9}X>>MoV@x6y_uI8b^}5oCL#2Sq}meB(PPXDGYWhho|3J~WJd z(ud3>HK14*>(zB0v!4eZ)8qG9;pwVAKp6;PY`lW*L#p#vQBs6o2`p9FAFrZO{M1!6 z4%)(h_aS;T0o;E36fKdAGj@C+9=!YF@vC4=O2Fwch9}EfS?RJDTC)sZmVnPh0qjW% z4yS_Sn*~?_$7=<+1PV-;ii<>{s)7rF7i?z{eh6awbZi09H68y04v)^j!y+I=PZ?e# z3e25@+rWHj4!$k0$6mq37>>W1hrgtx-Zbl&v6&_&mjGp~KnN@JNOP=q{Fh<}Hq$Zu z2aEAeG3DMRxDkT9RE{l>gDqK(ouF=7j)S6~k87|O)Y_G}8^PF=nR-UXOx@`TmO$U3 zXO2~PTN1#|uEV3j@AvEQr|^cdUv9xOVhq2{v;!xaVAyPWij>F_x8jLV=&Y?cHCBuv z=(m*#;@S&pLO!>cgT>%Yd+{s^F)kg#`{Rwma#zT%DCP1B#pYJriem89Kf~LSBUBHB z4PRI>l39DP2D#Vw;y=fys+tX6a-X6o{z98i(Pdr9vAcW<*nM_6oLw=RbzZ|2P{nuG z@LJKn#*gslQi7q`LUuXFF83z^up4$m@MAmPdCq)=RWuBj1_!_6N_HXbp2r=V6P7+kCcz}N` z&}sj|mC;d#Z|&MOUio!ak4XkQcL+zaE{O;_y@kldNJB5I_t}8AgrxI5m}CNH*hNa_ z4uNMk?TxFofJIkSmKI5-Ld?oY@EsZQ%PTho zoUoWz>I*$9YfTvR=?sVk{*T6!h2S^W25KA>+dtrEBM!inI_>0?a8t9$Cm=FqQVSw1 zlQJmex-9D9V;uw*g39eqk_+pIEt^ChAtS&VXA=kCIGI$4=HHq^PJ@6Mq_H#kBzxrl zB@=&=Pfh|!`H3R(mVhoUCM_VY7n3(YRFn`{4ML>wYb9j3BqE7-;TbJ;1$M2VCA6DA zDkZt%J#>~4*bCfSMy5eK`SF*@_y~yc@qFTmQ#H{W(?8p1>MQktVz9Xj$Xf8aynt*I z1Snrb&WTngFCnHF#@0##_b`82Nv?cqv7&vuY2}Oh_I)({Mg841z>8tD>3g-eFqL z{?NYd)_(s z{LVf1{LZ;|ua7@9x&NtCVN2A)-sOc>*0_O|vFqjBuviKx+7>_Ve)l{DL=;F?n~vp4lJQ6Az=PKvIExJMz5~~)8ZR4R!x>NgwrO6Ze$@?KQ!F} zz(>hpU|pYG35HP$#mEWD*0 zRbpgtR*AmBvsBI2sM%%DCeM~N0gpe}s|U;ql^! zq(0WOSBhoxha?MIvRsN{oDEUNig5vO!!MNMYx4nm(1Q&q zt8kY6_JM$A_62|%meY_3WM)DfM1G%h1jEb32gJ+Q5+2!a`!K=D=EbYC{|OD>JtrMl~oo#jdxmvd9Bvo zRYqq#X$XSHvWtxz_Pqu=pljM>OrQWn2kL&gO2 zFE1kl5QNl`9N2^9tsqWNn^usZDDm%`NH?gZYse%93Y9u7Kfg|M`hvAUg{<<2FOp$P zmf=@4&Dp7$FKqTV2J~JnV1}APJ?(mT5PaVBldCYdY!dSLsB|FdYK%@)X)`!t-eBJaNG_;Qo-P_VpEA^Rzgc_rCDh= z{WeWD_+PG&Nm-$jTXTVADPz4x~Z;x9*W=A(rhv`9chT@_$GSjWxQJHr-|iqH-~95Vh(e6fOmo ze@N+N3YmvvDKx>pIJykN);$(Ki=#(jsW_h6z_TTuCINzVCD7xbrp=&dpqu$e$@DO^ zO}E?|aKcD-YHnZWMiZzTN`+Y9e<_W+!7no%)D*}SE@i*sR}^3-0LmiY2nIa$lRVIb$H~53uv;;04X1CHuSPiiHGV0*&dGrUO_P=_X{ssh4 zkj-}H(?WoYHjxaE&2N{(Q)3qXk9;}`?Z&q_=r09io{R1Ram+=bx!8^(I)_ykQBgkl zc8baQb+KqPeyNz22=!43g~8^FO6g)K8sEH#&W{4*xI%p?hDVgZ)EoS!)~N*)m1Qob zgW$DqF&!54KE0Hl6BWBzOHEPobqy5WQhud@UWq(g&(n`YFwIT>1m=ZJbU&Ec$0{8I zwc|y)F_wyPXXqrFO~q@@vQHv+hRa)4)KTivtg;v{d0-n{2kUBkyb(XPw}!;A`)#zD zAK5@B;$Hr4i1P1-qIO&&EBbZuZ=i{9t(Rsx_=G79Clh^*n|(h-H}Q?HN$*Bc!`;;L zc)u>;F7`_)De5S8l`Sm)-+nxMTsjv^``47Oj$BI70tJ^68(B+p`P>sy5JeW@h11`*GEOS+i%U&Ma!3jhEB diff --git a/public/js/dist/all.js b/public/js/dist/all.js index de3e3fba3fdb0e6df18ef568c5829f81ea41de4c..b4443c9e4cbada4492bc41ff0e9c28ca38b73ce7 100644 GIT binary patch delta 1384 zcmZ`(ZA@EL7|yvLZ`%t<2b3WWggev`TBIv5VA+7J(Tt5SKrH)UPzp#hptUWGvNaL1 zh4~R!E#u`wjR-TwxJ*TTlbLNyM~s^vGm9pRILc!7$C((-q8mcIm+2tc{B`g1oaa36 z$2sqL=c@Ti*!=$S)syCgFB?MhhX$E684NTZ3f;Ngul&Avr}_|H?_lFhq9X^GW22bg z^;Eu$W4%zK&9US)<>%Y&p_{AadjOM;LZT=aKiQap=RaVNgnnZZu9{@KcxUT2Oznk4 zLAAiSAXFq+9QLeShkb)=bQ)8$j0Xeh0i(6OVtr`rTpV>zvYA3h+)#l#eAGiX!ZH_n+ z`KRGok5Db_&MwPQ+mMSDR!E|Fub>eXlcY{zOcdq%s*DN@>bb;F9iN0#K}p2u1(r!8 z1CY)eygs|n>Dbz0_j(KDR%e^D)!rgw?g%7P7{SIpSU`$klHrbFC_qmYtVMk}XmJ}t z)fP{CTW!7FvA^AIZ0vM<8ogeptF1tGxqZslo4LF!2WpJ}A6-&}rn^2^Hv*=u%Nx@R zeVMh+b-v8|J&kScEiLJrP3D3Jtz!8QJgyr5n;-^;VDC!o9)+}(_{~wUL@w($c`zBc zc)UFdmsmDUzXk_Hyxt84DtikY45y;F5-b{rBHT0qL#UqsQ`T}Bav)&b<7;+$Giy86 z$y=6Mlv3Z=-4^P=d14-55GYW}CHZcx|Tw*N#QYGpz#U%m_>=o++^ygKvPgR_s5tH$+8)7sX zhQ+kO4lxZ)6@q5)F-gMrz7-Sj$bL~zmRa#e1G%m6QVa$bSQJL@h7zi2RnA%-G3sv3RNnL=5*pB#kbxsc4psbF~nU zZ`6T>PDF7dYz1S)v_)n>jOK2Uz6YKFI(HOK>x8B2tqxdZdzrmd9WeC{V0SO9q0_G_ z%@b69Y1(;ZP%s>X${33!Cp&w6o_%@Psq}3KnrQY4+~kxJFZ}?w{AeiG=;^zint7G_ zs#5clAN$uZzym+?G4$Ej8ZEEz7cXnZ{nVzsK`I(A)qd{B56@}i=-?OHc$ErX)SmHE znN|0YifW$L-Sp$^MlI0J^STAqx%7f=-j98kB`r?tC7HaNr7Dh>Y8x=MQHrB$Mbf4& zTJx#Yr;6V_BUN_M;)aNjih>0Zxm}pt&jWq)QN(~s)l)=FS7_>(6bipC(qVJt1%<`% NcFsUG*^%4x{sD%K>m^i+I^g78dpc6_g39JgeQaKJT3=`w^Z7--Jc!r zV1X0+Xd)y>i5q{7lHVQ&=Oy_77iX*xGtOO-V=|WiNzw?lJDeU^0@e=BFjGK%ky&u^ z754W!aQoO3`14uzHi?JO|0*-XoiVn;toDZN16I9iBfQmS)F83MsNm3FL}(!z4mS!l zCcNDxydL0a@Ro2k858aaDRmEKZ5e0gRJZ$x-I^83vHCoHp4?#WnlF3DSvq!Bip0ok zyPV>_G`!j_wt6|rx+b342#M#35pLfRRlNR#nC)d+sV_4#0H;nXW;8qK6%*Ba>n>X4 z!;e_w)}MNbR;T89ZTY^!Jij$3kdu*@b1cNi*H<3$#-+Ml2|${u8>gD7EWyPcYz|-c z(=REKlk}NJK7VhFHd4H}M281CvNcHU6h3)YN`d)q$ppErk_wY85`%>nNyWt`sXoMI z#S2oHLjSC^0XAQjWGGpd*5k^ebkHw4f}P-+CN_vP({$W#XT!<-K%Qz=hh_C_KLzGu zWpKTLKMT(@1vfRZ8Z$5^K3=MYnvi@lg+3! zSX=A@-TrtX&cDNeJRtcc1Nd1x%@W~E7yrydhiRRFJe(%5*hl9{0e;X=2c*b%qG{|6 zRsrvNnF-GIP#M;RXeNAqj4qK9NE&5({-2tK@(wCv_yp}G`1=JmlFL0A`ik8Z;O5sX z2~Xc*-yh*rN3CoSaiC6)aRg;qG!gfIzRTLvt=Vbins(PO@(3YZY#qG<204GLEWR(9^S}vn;R; iV#|h2IQpJpK){6e4as`R<|5+_A+j`MMrEhbvGZRlxo2?z diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 80ab5fc8ee..4444c19b40 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,5 +1,5 @@ { - "/js/build/app.js": "/js/build/app.js?id=a7bc4e83c6d3ae912094", + "/js/build/app.js": "/js/build/app.js?id=f1cc6a7ff104c9cbd2e4", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=59413334823616b81341", "/css/build/app.css": "/css/build/app.css?id=3911a887c2bdc7d0b528", "/css/build/overrides.css": "/css/build/overrides.css?id=688f59cd273484405f9b", @@ -34,5 +34,5 @@ "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=a534edb9f7179f6dcf62", "/js/build/vendor.js": "/js/build/vendor.js?id=ac70ab5fd89efc2aa7d0", "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=9407782198cbc29f23d1", - "/js/dist/all.js": "/js/dist/all.js?id=f930032e5ca0a4bb587a" + "/js/dist/all.js": "/js/dist/all.js?id=43e4e9e0ddff773e54b2" } diff --git a/resources/assets/js/components/importer/importer-file.vue b/resources/assets/js/components/importer/importer-file.vue index b44ce0b3e7..f876e1aee5 100644 --- a/resources/assets/js/components/importer/importer-file.vue +++ b/resources/assets/js/components/importer/importer-file.vue @@ -22,21 +22,31 @@ tr {
- +
- +
+
- -
+
+ +
+
+ +
+
+ +
+
+
@@ -238,6 +248,7 @@ tr { 'import-update': this.options.update, 'send-welcome': this.options.send_welcome, 'import-type': this.options.importType, + 'run-backup': this.options.run_backup, 'column-mappings': this.columnMappings }).then( ({body}) => { // Success diff --git a/resources/assets/js/components/passport/PersonalAccessTokens.vue b/resources/assets/js/components/passport/PersonalAccessTokens.vue index 6dec30240b..3b96dee17f 100644 --- a/resources/assets/js/components/passport/PersonalAccessTokens.vue +++ b/resources/assets/js/components/passport/PersonalAccessTokens.vue @@ -66,9 +66,9 @@
-

+

Create Token -

+
@@ -134,9 +134,9 @@
-

+

Personal Access Token -

+