Просмотр исходного кода

Ticket #5425 - Tasks: Functionality improvements. Stage 2. Budget.

AntonLV 1 месяц назад
Родитель
Сommit
f109600e32

+ 2 - 2
modules/boonex/tasks/classes/BxTasksModule.php

@@ -847,8 +847,8 @@ class BxTasksModule extends BxBaseModTextModule implements iBxDolCalendarService
 
         list($aCssCalendar, $aJsCalendar) = BxBaseFormView::getCssJsCalendar();
 
-        $this->_oTemplate->addCss(array_merge($aCssCalendar, ['manage_tools.css', 'budget.css']));
-        $this->_oTemplate->addJs(array_merge($aJsCalendar, ['modules/base/text/js/|manage_tools.js', 'budget.js']));
+        $this->_oTemplate->addCss($aCssCalendar);
+        $this->_oTemplate->addJs($aJsCalendar);
         $this->_oTemplate->addJsTranslation(['_sys_grid_search']);
         $aResult = [
             'content' => $this->_oTemplate->getJsCode('budget', [

+ 0 - 1
modules/boonex/tasks/install/langs/en.xml

@@ -482,7 +482,6 @@
     <string name="_bx_tasks_grid_action_title_bdt_add"><![CDATA[Add]]></string>
     <string name="_bx_tasks_grid_action_title_bdt_edit"><![CDATA[Edit]]></string>
     <string name="_bx_tasks_grid_action_title_bdt_delete"><![CDATA[Delete]]></string>
-    <string name="_bx_tasks_grid_action_title_bdt_calculate"><![CDATA[Calculate]]></string>
     <string name="_bx_tasks_grid_popup_title_bdt_add"><![CDATA[Add Budget]]></string>
     <string name="_bx_tasks_grid_popup_title_bdt_edit"><![CDATA[Edit Budget]]></string>
 

+ 0 - 1
modules/boonex/tasks/install/sql/enable.sql

@@ -544,7 +544,6 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 
 INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `icon_only`, `confirm`, `order`) VALUES
 ('bx_tasks_budget_context_administration', 'independent', 'add', '_bx_tasks_grid_action_title_bdt_add', '', 0, 0, 1),
-('bx_tasks_budget_context_administration', 'bulk', 'calculate', '_bx_tasks_grid_action_title_bdt_calculate', '', 0, 0, 1),
 ('bx_tasks_budget_context_administration', 'single', 'edit', '_bx_tasks_grid_action_title_bdt_edit', 'pencil-alt', 1, 0, 1),
 ('bx_tasks_budget_context_administration', 'single', 'delete', '_bx_tasks_grid_action_title_bdt_delete', 'remove', 1, 1, 2);