From df1a9ee5efdda1b262bc4169cb922a0f49c3c750 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Thu, 27 Aug 2020 09:23:10 +0800 Subject: [PATCH] * Finish task#7702. --- module/custom/control.php | 8 ++++---- module/custom/model.php | 6 +++--- module/group/lang/.resource.php.swp | Bin 16384 -> 0 bytes 3 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 module/group/lang/.resource.php.swp diff --git a/module/custom/control.php b/module/custom/control.php index 107b253ff7..bd26fb1b40 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -354,11 +354,11 @@ class custom extends control * @return void */ public function estimate() - { + { $this->lang->custom->menu = new stdclass(); $this->lang->navGroup->custom = 'system'; if(strtolower($this->server->request_method) == "post") - { + { $data = fixer::input('post')->get(); $this->loadModel('setting')->setItem('system.custom.hourPoint', $data->hourPoint); $this->loadModel('setting')->setItem('system.custom.cost', $data->cost); @@ -368,11 +368,11 @@ class custom extends control if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError())); $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('custom', 'estimate'))); - } + } $this->app->loadConfig('project'); - $this->view->unit = zget($this->config->custom, 'hourPoint', '1'); + $this->view->unit = zget($this->config->custom, 'hourPoint', '1'); $this->view->cost = zget($this->config->custom, 'cost', ''); $this->view->efficiency = zget($this->config->custom, 'efficiency', ''); $this->view->hours = zget($this->config->project, 'defaultWorkhours', ''); diff --git a/module/custom/model.php b/module/custom/model.php index 8b42b02f9e..d9be895175 100644 --- a/module/custom/model.php +++ b/module/custom/model.php @@ -362,7 +362,7 @@ class customModel extends model } /** - * Get system swapper. + * Get system swapper. * @param string $module * @param string $method * @access public @@ -370,8 +370,8 @@ class customModel extends model */ public function getSwapper() { - $current = (isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum') ? 'scrum' : 'cmmi'; - $link = (isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum') ? html::a(helper::createLink('custom', 'setcmmi'), 'CMMI') : html::a(helper::createLink('custom', 'setscrum'), 'SCRUM'); + $current = (isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum') ? 'Scrum' : 'CMMI'; + $link = (isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum') ? html::a(helper::createLink('custom', 'setcmmi'), 'CMMI') : html::a(helper::createLink('custom', 'setscrum'), 'Scrum'); $output = "
"; $output .= ""; diff --git a/module/group/lang/.resource.php.swp b/module/group/lang/.resource.php.swp deleted file mode 100644 index aa2ed877007961f0db6916fb47239117c9491802..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 zcmeHNZEPGz8QuU16bMDFiquGyrC5q%#XjFTZerq?3I|nzCUqN=(3BA7cE@*H@9l2) z!_Eb@5CIYei8kd=+q6ZkkV+*`LnWk2X^W6bRX+Y8B+5U8gk$o9^oyqS6P|Zw)_1$U z@fpM)q&ex)+4DZ{JMTQZ@668J)<+NR+i&k08MW~FsAcg@*B!fQV9>hxD;umh3{z_E z_sQy6kY@c@mQ`6`absDa1HCC&NQvcM|pR_N(?2GI6G(@9-QNSo*6fg=H1&jhl0i%FX;QwENG`hn2 zI)?EcHI#Yvy`l8|FZH=ewfiOeyUPA0)&5M${!YpNW2%F^pSP9$^UAMTvcIM5Ur_cZ zO7=HP@!u)g-zeE{Py^2U|EIF=Rq-D#*_E(ktW@SJ8zGD1WO8uWH*_?P6DA`|B_Cw14e93-6 z*$*rGRhx?O|E}!$nNC)+tKnLoQ2t9LyJ|LHMggOMQNSo*6fg=H1&jhl0i%FXz$oxv zD!^Rvv%mEx+Nk39|9t=d=B1W(5%?YOYhVZP?nf-^Ip7R%8pwd#fC%_9FacZ%yuKN} z!0&;d0^b6T0h7Sxz=aQ6)^CBwfFA?j1Q;*{>;XOwy!|1|`Xg`#xD#N&B(NLU0$lu{ zW&H-YA6Nh~U0apPp;+)|Zz%#(TKmr^9hJXzKUAGtVLx!$u?9y4TQd;ih}1$i z)JH-fB6)$!kAszGpT9IB2b=|U5bXQ|zHI4)E%Fm5jCsx$@kNV{?sA`}d^*HCEKZtG zI>i>9UyB8-QSd9a==_`}E+wB~NwOHmF7;Pz(fM)LOK0M6&hy3K;Mdinb8_1OYk5wt z1`STO=p3R>599;~)v|`et=vhwdT6zgCbg~M(ui5B%LRQN(S%i>Nld5boE6j@g` z6u(e*#rUGyI&`q}`csofHyz0ae9=x)*YR=74sP3RRfg>SZCk$THDV7{R?1d{DNayw zrpV*3u5aZczDSpxxhj*K(Ic6CG<)>QCm%hBlh-+ksgtORb zYNCwGC=IWx;0uzCs~`(HL3YRpE#~>?qt~^m?oeZKQctU^S`D2H^F`NOQplxN6ANK8 z^gWk#%^*cmRgjXbUYy2?B$*LEp7J2kC#4ot=C(WKJMo4UhLX%gW!rcr=OQ%3N7 zw|6I0nj)3Ln%3RRm%O=cHlAB~ESG*-|Lr0BTHg!urzg9arqQP>^lJEs zd^LO|;Hh9O@R+7b@$fOQ&m9nr5!OM>Hlk6yIWAgRhHZ{|2AXbWLDJ+w!#<2>XM57g z|G(A=_=zN(OGhvpO{qj2%*Qg?k(ul5L6yyk$RCNadL=?v75uYMt&KF(mcLDSIbqa} zy+)IsW2aaCu8odP4A(}htAAffqjGrvn-t1e{cj(WJA{EXXp)k z+W+5z{q(B)NU;m8#{!_qN;CsL^U>w*8`~iFX2LU<*xF3iCIs=#nt^k&?$Nw2{ z2XH&E7uW(^3H%j%`=@}jz)4^hI0y^?uc&|~c`gvYw0Lyls693J$GFMQao z?D%z@evP5yjL(v;NzV~<2EU?j?u#=A@>xT#RW7o-^?Iovde+%T9O8tMMeAhO<8U$I zAb-vB<^~6Z;<#1~Kddu$K4T>*ho^FR