From 27765d1b7544edcdc48e20ccc5a8588ee26f69d3 Mon Sep 17 00:00:00 2001 From: Marcin Haba Date: Sun, 28 Feb 2016 17:23:25 +0100 Subject: [PATCH] baculum: Show jobs stored on volume --- gui/baculum/protected/Class/JobManager.php | 18 ++ gui/baculum/protected/JavaScript/misc.js | 33 ++- .../protected/JavaScript/slide-window.js | 21 +- gui/baculum/protected/Lang/en/messages.mo | Bin 28267 -> 28399 bytes gui/baculum/protected/Lang/en/messages.po | 6 + gui/baculum/protected/Lang/pl/messages.mo | Bin 30572 -> 30724 bytes gui/baculum/protected/Lang/pl/messages.po | 6 + gui/baculum/protected/Lang/pt/messages.mo | Bin 30363 -> 30495 bytes gui/baculum/protected/Lang/pt/messages.po | 6 + .../protected/Pages/API/JobsOnVolume.php | 46 +++ .../Portlets/VolumeConfiguration.php | 10 + .../Portlets/VolumeConfiguration.tpl | 273 ++++++++++++------ gui/baculum/protected/Portlets/VolumeList.tpl | 2 + gui/baculum/protected/application.xml | 1 + 14 files changed, 315 insertions(+), 107 deletions(-) create mode 100644 gui/baculum/protected/Pages/API/JobsOnVolume.php diff --git a/gui/baculum/protected/Class/JobManager.php b/gui/baculum/protected/Class/JobManager.php index 729b806157..f08a27001b 100644 --- a/gui/baculum/protected/Class/JobManager.php +++ b/gui/baculum/protected/Class/JobManager.php @@ -113,5 +113,23 @@ class JobManager extends TModule { $pdo = null; return $jobtotals; } + + /** + * Get jobs stored on given volume. + * + * @param string $mediaid volume identifier + * @param array $allowed_jobs jobs allowed to show + * @return array jobs stored on volume + */ + public function getJobsOnVolume($mediaid, $allowed_jobs = array()) { + $jobs_criteria = ''; + if (count($allowed_jobs) > 0) { + $jobs_sql = implode("', '", $allowed_jobs); + $jobs_criteria = " AND Job.Name IN ('" . $jobs_sql . "')"; + } + $sql = "SELECT DISTINCT Job.* FROM Job, JobMedia WHERE JobMedia.MediaId='$mediaid' AND JobMedia.JobId=Job.JobId $jobs_criteria"; + return JobRecord::finder()->findAllBySql($sql); + } + } ?> diff --git a/gui/baculum/protected/JavaScript/misc.js b/gui/baculum/protected/JavaScript/misc.js index 4c1f6d044d..bec1322cd0 100644 --- a/gui/baculum/protected/JavaScript/misc.js +++ b/gui/baculum/protected/JavaScript/misc.js @@ -1,21 +1,30 @@ var Units = { get_decimal_size: function(size) { + var dec_size; + var size_unit = 'B'; + var units = ['K', 'M', 'G', 'T', 'P']; + if (size === null) { size = 0; } - size = parseInt(size, 10); - var size_unit = 'B'; - var units = ['K', 'M', 'G', 'T', 'P']; - var unit; - var dec_size = size.toString() + ((size > 0 ) ? size_unit : ''); - while(size >= 1000) { - size /= 1000; - unit = units.shift(units); - } - if (unit) { - dec_size = (Math.floor(size * 10) / 10).toFixed(1); - dec_size += unit + size_unit; + var size_pattern = new RegExp('^[\\d\\.]+(' + units.join('|') + ')?' + size_unit + '$'); + + if (size_pattern.test(size.toString())) { + // size is already formatted + dec_size = size; + } else { + size = parseInt(size, 10); + var unit; + dec_size = size.toString() + ((size > 0 ) ? size_unit : ''); + while(size >= 1000) { + size /= 1000; + unit = units.shift(units); + } + if (unit) { + dec_size = (Math.floor(size * 10) / 10).toFixed(1); + dec_size += unit + size_unit; + } } return dec_size; } diff --git a/gui/baculum/protected/JavaScript/slide-window.js b/gui/baculum/protected/JavaScript/slide-window.js index 557b6e826d..423566ce13 100644 --- a/gui/baculum/protected/JavaScript/slide-window.js +++ b/gui/baculum/protected/JavaScript/slide-window.js @@ -316,8 +316,8 @@ var SlideWindowClass = Class.create({ return is_open; }, - sortTable: function (col, reverse, set_cookie) { - var table = document.getElementById(this.gridEl); + sortTable: function (grid_id, col, reverse, set_cookie) { + var table = document.getElementById(grid_id); var tb = table.tBodies[0], tr = Array.prototype.slice.call(tb.rows, 0), i; reverse = -((+reverse) || -1); tr = tr.sort(function (a, b) { @@ -353,9 +353,18 @@ var SlideWindowClass = Class.create({ } }, - makeSortable: function () { + makeSortable: function (grid) { var self = this; - var table = document.getElementById(this.gridEl); + var grid_id, set_cookie; + if (grid) { + grid_id = grid; + // for external grids (non-slide) do not remember sorting order + set_cookie = false; + } else { + grid_id = this.gridEl; + set_cookie = true; + } + var table = document.getElementById(grid_id); table.tHead.style.cursor = 'pointer'; var th = table.tHead, i; th && (th = th.rows[0]) && (th = th.cells); @@ -372,7 +381,7 @@ var SlideWindowClass = Class.create({ while (--i >= downCounter) (function (i) { var dir = 1; th[i].addEventListener('click', function () { - self.sortTable(i, (dir = 1 - dir), true); + self.sortTable(grid_id, i, (dir = 1 - dir), set_cookie); }); }(i)); }, @@ -383,7 +392,7 @@ var SlideWindowClass = Class.create({ var sort_param = sorting.split(':'); var col = parseInt(sort_param[0], 10); var order = -(parseInt(sort_param[1], 10)); - this.sortTable(col, order); + this.sortTable(this.gridEl, col, order); } }, diff --git a/gui/baculum/protected/Lang/en/messages.mo b/gui/baculum/protected/Lang/en/messages.mo index 474318dcf0f15f6c83bc11b88903bd566a4d349a..5fc682c7ea10c41ed624c79ae0377c94da642390 100644 GIT binary patch delta 8268 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 Bh*AIm delta 8134 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 F{SQ5NYYPAX diff --git a/gui/baculum/protected/Lang/pl/messages.po b/gui/baculum/protected/Lang/pl/messages.po index f04920467f..6b6f6c04f0 100644 --- a/gui/baculum/protected/Lang/pl/messages.po +++ b/gui/baculum/protected/Lang/pl/messages.po @@ -1137,3 +1137,9 @@ msgstr "Uwaga! Dla każdego użytkownika (wyłączając administratora) powinien msgid "Invalid login value. Login may contain a-z A-Z 0-9 characters." msgstr "Niepoprawny login. Login może zawierać znaki z zakresu: a-z A-Z 0-9" +msgid "Jobs on Volume" +msgstr "Zadania na volumenie" + +msgid "No jobs on the volume." +msgstr "Na wolumenie nie ma żadnych zadań." + diff --git a/gui/baculum/protected/Lang/pt/messages.mo b/gui/baculum/protected/Lang/pt/messages.mo index 53e55e53d5bcfc8ef750a847ef16fc5491b3081c..73e8e97cac9d677ef35a3e7d4984e21a4c946200 100644 GIT binary patch delta 8280 zcmZwM3w+P@9>?+TY&J7yw%NtT=C)ys+0aC8GZM?aT;`UUOEz;)m%lFRgrp>;i(J-K zN-D}B97;s#h*AehQqu8= z9atOpV>lj1J?AvWxqx$*f(0rK{fSJB=7KJmfY+ijFdlPpHrB!y%q^HseIM4vbC`?~ zjhy4rt^um!?x=zFM%_Oc6X@TSP|!?nL0xzUYUKB#GO!Glq1EQ|sOw)r4Qw;UmS7z9l~&(q?lcdgW^@8||5>~zggu0s z$SoQE{GF&wE=FBfiRyQK2KjGIVKWW&@N3lCMr8V#*FoLT(9FUJ>UpRPbi{1zW>%mw z_7rL!SvFQIn(Hq>4^fXc*4B(nkc8wIU}YvpH{i3dW!Y8ixU;xH*MbY=`RL zYSe|pP#>0J)EZAiJ!m1G!lkI0%;B@B)IN!t`Ln2*@4`iR2>aleJpTn%p?Cr z6w=s%+FWJGwXPDm#(jc1AI-_pSd3TTHdKawMqXu?+TMQ$3Qz->Zr*RcV7`NKoc{t7 zbbovDuMbZ&Po0J>P@7{VYE56nMBIzo6DLt`!`G-8e}`I%Ur_68Eb^oY!pu^joWkbnr`@ zh&taK)lZ-c1+7(oRO-f{W_~LwwJR_UccNx~5<~GT)PT;S2Kqf}U?ErfdQDVEDX9B$ zti2uTz5-0q``?FxE}Vdx>20VR?lBjk2J`@GH?PMO+=BW79zo3{fgRNuGqE<7nm3^` zwGg$0D=-OHVPn1jZ&FC7;W+BIpXQmMl^_p}>Wnc)V;at=}SD0(f z^{9bt##r2j%E&>~5`2yt$a&P;@MBlbBt*Fhj2vb9N zD^Mxj(A{7E7V7$asDXTp8t5?$#WOen&tW`vE+GHvXi$Nl*=W?7%|qSr0EXc*RL3h& zH?Br?vcdi<5A0z)oy851>-^87f8Rto}1?> z<2ck>rlYRQw0av1qn?jd@hVgX3Qz+tLJi~w?2Ca43VQHc*qD^=L#6tBPv3qCHPfhG z{>CKK`3$SKMV;?%_Ote4+)4Xn)a#agwcm6-QJF0E23!e+NE)V~HqC5Q3Kw87)u<6~ zLfyCD23fn85o9I zvpJ|tJYeV7VNL40FbY4!U)VFpP#qn)*0&!=W#}xby-Ghnq3YO$dK{|XLH)?TMs^ns z`XW7y)o~pv1Dj9}*pAA;9@O6l?_*00?e9CxLEYC0^_*Uqjw8(g>Pz|*^2uk%|$X7vTnR%$S>SXny7(;z5*2d{LALnBwMh)a&Pq+cKG>L#4_IQZMSVavV=it*rSyWeM-25H)xcQVlTe!}3lp(}wGY5r z)JssAooV&kuo?BmNWTHMnF60<_Z}+6F~j`K8lcuZ7qtgESbI0rb%RhdEwTDE^G?*j z9zqT58Po({M`dU)YCwlET<`yJ3hLmro%qiD8Eew+hWj;)Mr9@mld&GAV0+XO4aB-w zfl0Usdcp39?H!7uP>!$R-N>b`<7mIMk0CFLJB~cswHd>|F>uKk@~@d6r9m@D9m~4nKxDtUXR!c7 zZr~;?L=E63?0`?B?)w~@W70VPUFeQk)GII>pFj=tJ=Aq)kkxf@B>{h;jF(p*lm)2w zb2BQ%Col}ZLT$Els6Fv3R>g?%-kN3{>b_*u>y?gL`z+Mv8;9XI)tnumpbyGzsI^;y z`e3X=ZORv{eIshkcG>w)P&4`hwHYsAIwqI;_r3$F{W_~xpsrtRK93Ek2i~U8kir?% zCo*b+|59~D&3rU!)0CiQUWQuhTTtJHrKs2IIn)EUVmKa0U4I%ip&w8Kx`?_zX<~3Q z2V5%(5j1p0b=VWNW_?f@x!LNAus8KBs1Cy?@uxY~MGa)Kc{{4(<*0#FqBiq7%)q_a z7%yOs-v5NjewX$_b-W0h;TFunFR?i$-su0}=!P1=cylgRqrMm;aXISCw+c0Z4R(H~ zxer^?en{u(-&L8y`ePin#|QBg?nP~~m&*L>@*3t*zl6$EUb+7+6V_qxMJ-)SfG?AphEQ3usUW+p!kDkG1hQYHwV?wjsQBs1909_Z=5t zb?QZ^84pF>Hxff}D(X8j1GNYCqpm-T%E(XC$-iz$o#AiDMm?wvYG&b_r5o9-fNB2{PlO;-o$({;pneA(O`prF(pMRo8a>bF<;EN?REK`l_3 z=xFr_pDXzJJkeWE=jey`p*qT@T#XoE=blpY3!JEJ4O=LWA@&m6 zh*3m6&YeOX3B)MsbBMxV%m4rQ)~Y$C);|9am&~X9IiU>bhzVg>TECBpbRIgEs6w2h zo`AE7%STHJ6@REJy*CpxY5NSX$H9a)mW~}B_ir3V`-jLI?OwKa{U#i*v@Ej*y%IWV z5?2z*+|+=0jPhTJa>`n?IH)ArP#%CfRuPwo6rwBfGf~2M9j8661@%_eb}enADF^;$ zC$%ew6T7W0a=D-`v5E3qM41{n_7izT9U`5W#x)^?j-hxBeosuHyc|yw_Y&>x8j9|H zVzceP;Jd9xy$J)ks2wqhvi^;)L$BPc!IJ;6*veU)UqbmKqK94k5ak*~p4F>k2kJVm zu(kuf%1`n?hQ>z3wL}E5j%K~fdJTIJyph2_(ceS8froJ|F{m?5!VGc(U53ESI4&bQ|$IVmlFM z=U=2;pZJE*aRqUlc$ApRHE-ipgpR|P`@e}39f+wk4z~vdui!^7>LZCnViENQ#CXa& z{^JS$45zI%v5(sAL^C4It}Diyf>-&^eRaxr1?zv9e>n{c?4tGNMeIu?6JJklId>zWqY%4TS@m0qUMg@5A`S&hmj8uR+7r>-uo7!wf8rL( zXNVh#gTyYP8lht%@fTtO@f-0P(Up6~5!Vp&sO#wCag%6kOZiT#_r|6nY=v%|=uc%R z@d(j{$Re849#8y8S;v#abm}dzGY-Mhr45qf0>4vgOjHn`5DybAx#A9-PNWi{)HmSe z<0UJ+iz6;Knw_}zUsi67`P6khNKCNu+F%QR0x5-asSGA=;A9CtOI%Ip*y;)X?8EuT zDGk94YrkMd+Jk3PFQpuc{~%&1&%%Ea8I%*T0Pn$H37-(SfvBZA$7+uoh;xWvh-Tcx z|HyTB+E>w$}qCXb7y8QTVWf9ncU6XvgUrj&xVp)?&ar_M2Sd6_3y9Jg-HKR zxkQviB_v&yl8`9TMOXjVd*9D`^yobLcz$o^e6Q!s^!Rr{k6a82d>$LJ+HuVaa;^rR zF5}!Uq@S;>Qs?eYaIPFK!Lqm(Y2u#6C@iw_y_P?0^(V}8R{kR%p?y#-=St&y$a4ek z1c`78E}B1KF!?`G9RwvhR}rJJ3f4spq&0?Ocgy$0n&gLLB+f+*bP1Nn)fk4)pq{fC z*wMqiGOP+qp_u8MOkbn2v2R2B(?}u@?DNSPhG?Djr52<-S36T&9j6 zSS;%Pc&tSKE`@|7#yR)6079rc{3 zx_*KcFrdAtLm~oGP!DKs4F+Hw`2x$&F_)TaP)q$R>i$Ap9OT?9sEK4H`TFjtmF$OV zHv!e}^d#255s7&e#N&&oy*-SY`Ddsb&YM?IGx!6w0wKw43r3omsQbpEwqhD;D_5Yl z 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 X@=ofI7Ee9XNmE|b3`lZ#^M5^ zJ?RVhDshd7A?g#$h+fo{Tr){`CvGL05+l^fk&;?GPIMtgP}!W&wbSF;kZ(h}t(Eu2 z7DQM+%~kJ>i+?7 CiEu># diff --git a/gui/baculum/protected/Lang/pt/messages.po b/gui/baculum/protected/Lang/pt/messages.po index 5493c2ef22..75c6eedc52 100644 --- a/gui/baculum/protected/Lang/pt/messages.po +++ b/gui/baculum/protected/Lang/pt/messages.po @@ -1139,3 +1139,9 @@ msgstr "Atenção, cada usuário (com excessão do usuário administrador) preci msgid "Invalid login value. Login may contain a-z A-Z 0-9 characters." msgstr "Usuário inválido! O usuário deve conter apenas os seguintes caracteres [a-z A-Z 0-9]." +msgid "Jobs on Volume" +msgstr "Jobs on Volume" + +msgid "No jobs on the volume." +msgstr "No jobs on the volume." + diff --git a/gui/baculum/protected/Pages/API/JobsOnVolume.php b/gui/baculum/protected/Pages/API/JobsOnVolume.php new file mode 100644 index 0000000000..ef785a1d50 --- /dev/null +++ b/gui/baculum/protected/Pages/API/JobsOnVolume.php @@ -0,0 +1,46 @@ +Request['id']); + $error = false; + if (!is_null($this->user)) { + $allowed_jobs = $this->getModule('bconsole')->bconsoleCommand($this->director, array('.jobs'), $this->user); + if ($allowed_jobs->exitcode === 0) { + $allowed = $allowed_jobs->output; + } else { + $error = true; + $this->output = $allowed_jobs->output; + $this->error = $allowed_jobs->exitcode; + } + } + + if ($error === false) { + $jobs = $this->getModule('job')->getJobsOnVolume($mediaid, $allowed); + $this->output = $jobs; + $this->error = JobError::ERROR_NO_ERRORS; + } + } +} +?> diff --git a/gui/baculum/protected/Portlets/VolumeConfiguration.php b/gui/baculum/protected/Portlets/VolumeConfiguration.php index efa8fc14cd..e9e0215528 100644 --- a/gui/baculum/protected/Portlets/VolumeConfiguration.php +++ b/gui/baculum/protected/Portlets/VolumeConfiguration.php @@ -21,6 +21,7 @@ */ Prado::using('System.Web.UI.ActiveControls.TActiveDropDownList'); +Prado::using('System.Web.UI.ActiveControls.TActiveDataGrid'); Prado::using('System.Web.UI.ActiveControls.TActiveLabel'); Prado::using('System.Web.UI.ActiveControls.TActiveTextBox'); Prado::using('System.Web.UI.ActiveControls.TActiveCheckBox'); @@ -65,6 +66,10 @@ class VolumeConfiguration extends Portlets { $this->Pool->dataSource = $poolList; $this->Pool->SelectedValue = $voldata->poolid; $this->Pool->dataBind(); + + $jobs_on_volume = $this->Application->getModule('api')->get(array('volumes', 'jobs', $voldata->mediaid))->output; + $this->JobsOnVolume->DataSource = $this->Application->getModule('misc')->objectToArray($jobs_on_volume); + $this->JobsOnVolume->dataBind(); } public function prune($sender, $param) { @@ -96,6 +101,11 @@ class VolumeConfiguration extends Portlets { $this->Application->getModule('api')->set(array('volumes', $voldata['mediaid']), $voldata); } + public function openJob($sender, $param) { + $jobid = $param->CallbackParameter; + $this->getPage()->JobConfiguration->configure($jobid); + } + public function getVolumeStates($forSetOnly = false) { $states = ($forSetOnly === true ) ? $this->volumeStatesForSet : array_merge($this->volumeStatesByDirectorOnly, $this->volumeStatesForSet); return $states; diff --git a/gui/baculum/protected/Portlets/VolumeConfiguration.tpl b/gui/baculum/protected/Portlets/VolumeConfiguration.tpl index 584f80e00c..4b7070295e 100644 --- a/gui/baculum/protected/Portlets/VolumeConfiguration.tpl +++ b/gui/baculum/protected/Portlets/VolumeConfiguration.tpl @@ -2,104 +2,199 @@ <%[ Volume name: ]%> -
- -
-
-
- + <%[ Actions ]%> + <%[ Jobs on Volume ]%> +
+
+ +
+
+
+ +
-
-
-
-
- - +
+
+
+ + +
-
-
-
-
- +
+
+
+ +
-
-
-
-
- - +
+
+
+ + +
-
-
-
-
- - +
+
+
+ + +
-
-
-
-
- - +
+
+
+ + +
-
-
-
-
- - +
+
+
+ + +
-
-
-
-
- - +
+
+
+ + +
-
-
-
-
-
-
-
-
-
-
-
-
-
- - -
- - - + +
+ + + +
+
+ diff --git a/gui/baculum/protected/Portlets/VolumeList.tpl b/gui/baculum/protected/Portlets/VolumeList.tpl index 59570fed82..382e05588d 100644 --- a/gui/baculum/protected/Portlets/VolumeList.tpl +++ b/gui/baculum/protected/Portlets/VolumeList.tpl @@ -72,6 +72,8 @@ ConfigurationWindow.getObj('VolumeWindow').show(); + Formatters.set_formatters(); + bind_jobs_on_volume_action(); ConfigurationWindow.getObj('VolumeWindow').progress(false); diff --git a/gui/baculum/protected/application.xml b/gui/baculum/protected/application.xml index 7f4c77477b..38cf970894 100644 --- a/gui/baculum/protected/application.xml +++ b/gui/baculum/protected/application.xml @@ -45,6 +45,7 @@ + -- 2.39.5