Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix - Registro horario - Error JS en página de Login #281

Merged
merged 2 commits into from
Jul 23, 2024
Merged

Hotfix - Registro horario - Error JS en página de Login #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51a6d04
Evitar error JS en vista de login
ManuSinergiaCRM Jun 20, 2024
12f285c
wip - añadir Id del PR principal en comentarios
ManuSinergiaCRM Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions custom/modules/Calendar/Calendar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,7 @@ protected function filterSticFollowUps($activitiesArray)

/**
* STIC-Custom 20240222 MHP - Includes/excludes the stic_Work_Calendar records from the activities array according to filters values.
* https://github.com/SinergiaTIC/SinergiaCRM/pull/114
*
* Current existing filters:
* - stic_work_calendar_type
Expand Down
6 changes: 4 additions & 2 deletions custom/themes/SuiteP/modules/Calendar/tpls/settings.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ $(function() {
</tr>
<tr>
<td scope="row" valign="top" width="55%">
<!-- STIC-Custom 20240222 MHP - Add information icon and informational popup -->
<!-- STIC-Custom 20240222 MHP - Add information icon and informational popup
https://github.com/SinergiaTIC/SinergiaCRM/pull/114 -->
<!-- {$MOD.LBL_SETTINGS_DISPLAY_SHARED_CALENDAR_SEPARATE} -->
{$MOD.LBL_SETTINGS_DISPLAY_SHARED_CALENDAR_SEPARATE}
<i class="inline-help glyphicon glyphicon-info-sign"></i>
Expand Down Expand Up @@ -210,7 +211,8 @@ $(function() {
<th>Module</th><th>Body</th><th>Border</th><th>Text</th>
</tr>
{foreach from=$activity key=name item=def}
<!-- STIC-Custom 20240222 MHP - The work calendar records are colored depending on whether they are work type or not. -->
<!-- STIC-Custom 20240222 MHP - The work calendar records are colored depending on whether they are work type or not.
https://github.com/SinergiaTIC/SinergiaCRM/pull/114 -->
{if $name != 'stic_Work_Calendar'}
<tr>
<td>{$def.label}</td>
Expand Down
8 changes: 6 additions & 2 deletions custom/themes/SuiteP/tpls/_head.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@
<script type="text/javascript" src='{sugar_getjspath file="themes/SuiteP/js/jscolor.js"}'></script>
<script type="text/javascript" src='{sugar_getjspath file="cache/include/javascript/sugar_field_grp.js"}'></script>
<script type="text/javascript" src='{sugar_getjspath file="vendor/tinymce/tinymce/tinymce.min.js"}'></script>
{* STIC-Custom 20240222 MHP - Add CSS and JS for efficient registration button handling *}
{* STIC-Custom 20240222 MHP - Add CSS and JS for efficient registration button handling
https://github.com/SinergiaTIC/SinergiaCRM/pull/114 *}
<link href="modules/stic_Time_Tracker/menuButton/SticTimeTrackerButtonInMainMenu.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src='{sugar_getjspath file="modules/stic_Time_Tracker/menuButton/SticTimeTrackerButtonInMainMenu.js"}'></script>
{literal}
Expand All @@ -102,7 +103,10 @@
// If used, updates the button color based on whether or not there is an active time record for today
$(document).ready(function()
{
checkTimeTrackerButtonStatus();
// Check that it is not the login view
if (!window.location.href.includes('action=Login') && !window.location.href.includes('module=Users')) {
checkTimeTrackerButtonStatus();
}
});
</script>
{/literal}
Expand Down
12 changes: 8 additions & 4 deletions custom/themes/SuiteP/tpls/_headerModuleList.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,8 @@
</form>
</div>
</li>
{* STIC-Custom 20240222 MHP - Adding efficient registration button *}
{* STIC-Custom 20240222 MHP - Adding efficient registration button
https://github.com/SinergiaTIC/SinergiaCRM/pull/114 *}
<li class="time_tracker_button_row no-show-time-tracker-button">
<button class="time_tracker_button btn suitepicon suitepicon-module-tasks"
onclick="showTimeTrackerConfirmBox();"></button>
Expand Down Expand Up @@ -732,7 +733,8 @@
</div>
</form>
</li>
{* STIC-Custom 20240222 MHP - Adding efficient registration button *}
{* STIC-Custom 20240222 MHP - Adding efficient registration button
https://github.com/SinergiaTIC/SinergiaCRM/pull/114 *}
<li class="time_tracker_button_row no-show-time-tracker-button">
<button class="time_tracker_button btn suitepicon suitepicon-module-tasks"
onclick="showTimeTrackerConfirmBox();"></button>
Expand Down Expand Up @@ -854,7 +856,8 @@
</div>
</form>
</li>
{* STIC-Custom 20240222 MHP - Adding efficient registration button *}
{* STIC-Custom 20240222 MHP - Adding efficient registration button
https://github.com/SinergiaTIC/SinergiaCRM/pull/114 *}
<li class="time_tracker_button_row no-show-time-tracker-button">
<button class="time_tracker_button btn suitepicon suitepicon-module-tasks"
onclick="showTimeTrackerConfirmBox();"></button>
Expand Down Expand Up @@ -893,7 +896,8 @@
</ul>
</div>
</nav>
{* STIC-Custom 20240222 MHP - Add registration button dialog *}
{* STIC-Custom 20240222 MHP - Add registration button dialog
https://github.com/SinergiaTIC/SinergiaCRM/pull/114 *}
<div id="time-tracker-dialog-box"></div>
{* END STIC-Custom *}
<!--End Responsive Top Navigation Menu -->
Expand Down
Loading