galads/icehrm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Updates from pro v19

Browse Source
This commit is contained in:
Gamonoid
2016-11-25 17:20:39 +01:00
parent 4c171bfce3
commit e6b4245334
273 changed files with 867 additions and 67718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/admin/settings/api/SettingsInitialize.php
View File

@@ -37,6 +37,8 @@ class SettingsInitialize extends AbstractInitialize{
}
}
BaseService::getInstance()->getMigrationManager()->ensureMigrations();
}
}

2
ext/admin/settings/dashboard.html
View File

@@ -14,4 +14,4 @@
<t>Update</t> <t>Settings</t> <i class="fa fa-arrow-circle-right"></i>
</a>
</div>
</div>
</div>

7
ext/admin/settings/index.php
View File

@@ -34,7 +34,10 @@ $options1['setShowAddNew'] = 'false';
$moduleBuilder->addModuleOrGroup(new ModuleTab('CompanySetting','Setting','Company','SettingAdapter','{"name":["Company:"]}','name',true,$options1));
$moduleBuilder->addModuleOrGroup(new ModuleTab('SystemSetting','Setting','System','SettingAdapter','{"name":["System:"]}','name',false,$options1));
$moduleBuilder->addModuleOrGroup(new ModuleTab('EmailSetting','Setting','Email','SettingAdapter','{"name":["Email:"]}','name',false,$options1));
$moduleBuilder->addModuleOrGroup(new ModuleTab('LDAPSetting','Setting','LDAP','SettingAdapter','{"name":["LDAP:"]}','name',false,$options1));
$moduleBuilder->addModuleOrGroup(new ModuleTab('LeaveSetting','Setting','Leave / PTO','SettingAdapter','{"name":["Leave:"]}','name',false,$options1));
if(!defined('LDAP_ENABLED') || LDAP_ENABLED == true){
$moduleBuilder->addModuleOrGroup(new ModuleTab('LDAPSetting','Setting','LDAP','SettingAdapter','{"name":["LDAP:"]}','name',false,$options1));
}
$moduleBuilder->addModuleOrGroup(new ModuleTab('AttendanceSetting','Setting','Attendance','SettingAdapter','{"name":["Attendance:"]}','name',false,$options1));
$moduleBuilder->addModuleOrGroup(new ModuleTab('OtherSetting','Setting','Other','SettingAdapter','{"name":["Projects:","Recruitment:","Notifications:","Expense:","Travel:","Api:","Overtime:"]}','name',false,$options1));
echo UIManager::getInstance()->renderModule($moduleBuilder);
@@ -47,4 +50,4 @@ $(window).load(function() {
});
</script>
<?php include APP_BASE_PATH.'footer.php';?>
<?php include APP_BASE_PATH.'footer.php';?>

2
ext/admin/settings/lib.js
View File

@@ -108,4 +108,4 @@ SettingAdapter.method('loadRemoteDataForSettings', function () {
SettingAdapter.method('getHelpLink', function () {
return 'http://blog.icehrm.com/docs/settings/';
});
});

2
ext/admin/settings/templates/form_template.html
View File

@@ -13,4 +13,4 @@
<button onclick="modJs.cancel();return false;" class="btn"><t>Cancel</t></button>
</div>
</div>
</form>
</form>