Gabriel/Inventario_material_v1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

probando conexion5

Browse Source
This commit is contained in:
Gabriel Fuentes Duarte
2019-01-15 16:25:09 -06:00
parent 0a5ae63449
commit 7a9b67b304
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+9 -7
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="a3c96782-c39e-4629-8661-f34ca5efc2af" name="Default Changelist" comment="" />
<list default="true" id="a3c96782-c39e-4629-8661-f34ca5efc2af" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/js/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/main.js" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -22,8 +24,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/js/main.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="16" column="24" lean-forward="true" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
<state relative-caret-position="220">
<caret line="18" column="80" selection-start-line="18" selection-start-column="80" selection-end-line="18" selection-end-column="80" />
</state>
</provider>
</entry>
@@ -194,12 +196,12 @@
<workItem from="1547236861734" duration="11265000" />
<workItem from="1547503840895" duration="2199000" />
<workItem from="1547508488120" duration="8644000" />
<workItem from="1547590167863" duration="599000" />
<workItem from="1547590167863" duration="921000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="49489000" />
<option name="totallyTimeSpent" value="49811000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
@@ -309,8 +311,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/js/main.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="16" column="24" lean-forward="true" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
<state relative-caret-position="220">
<caret line="18" column="80" selection-start-line="18" selection-start-column="80" selection-end-line="18" selection-end-column="80" />
</state>
</provider>
</entry>
js/main.js
+2 -2
View File
@@ -16,8 +16,8 @@ jQuery(document).on('submit','#formlg',function(event){
if (!respuesta.error){
if (respuesta.perfil == 'Jefatura')
{
//location.href = 'sitio/admin/admin.php'
console.log("Jefatura");
location.href = 'orion.acatlan.unam.mx/Inventario/sitio/admin/admin.php';
}
else if (respuesta.perfil == 'Area')
{