[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13930] fixing forms
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [13930] fixing forms |
|
Date: |
Wed, 16 Sep 2015 00:23:54 +0000 |
Revision: 13930
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13930
Author: psaul
Date: 2015-09-16 00:23:53 +0000 (Wed, 16 Sep 2015)
Log Message:
-----------
fixing forms
Modified Paths:
--------------
branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
branches/dev-syncromind/booking/js/booking/allocation.js
branches/dev-syncromind/booking/templates/base/activity_edit.xsl
branches/dev-syncromind/booking/templates/base/activity_new.xsl
branches/dev-syncromind/booking/templates/base/allocation_new.xsl
branches/dev-syncromind/booking/templates/base/application.xsl
branches/dev-syncromind/booking/templates/base/booking.xsl
branches/dev-syncromind/booking/templates/base/building.xsl
branches/dev-syncromind/booking/templates/base/building_form.xsl
branches/dev-syncromind/booking/templates/base/resource.xsl
branches/dev-syncromind/booking/templates/base/season.xsl
Modified: branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
2015-09-16 00:21:29 UTC (rev 13929)
+++ branches/dev-syncromind/booking/inc/class.uiallocation.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
@@ -310,7 +310,7 @@
{
try {
$receipt =
$this->bo->add($allocation);
- $this->bo->so->update_id_string();
+
$this->bo->so->update_id_string();
$this->redirect(array('menuaction' => 'booking.uiallocation.show',
'id'=>$receipt['id']));
} catch (booking_unauthorized_exception
$e) {
$errors['global'] = lang('Could
not add object due to insufficient permissions');
@@ -356,7 +356,7 @@
}
if ($step == 3)
{
- $this->bo->so->update_id_string();
+
$this->bo->so->update_id_string();
$this->redirect(array('menuaction' => 'booking.uiallocation.show',
'id'=>$receipt['id']));
}
}
@@ -382,15 +382,15 @@
$allocation['cancel_link'] =
self::link(array('menuaction' => 'booking.uiallocation.index'));
array_set_default($allocation, 'cost', '0');
- $GLOBALS['phpgw']->jqcal->add_listener('start_date', 'datetime');
+ $GLOBALS['phpgw']->jqcal->add_listener('start_date',
'datetime');
$GLOBALS['phpgw']->jqcal->add_listener('end_date',
'datetime');
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Allocation New'), 'link'
=> '#allocation_new');
- $active_tab = 'generic';
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Allocation
New'), 'link' => '#allocation_new');
+ $active_tab = 'generic';
+
+ $allocation['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- $allocation['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
-
if ($step < 2)
{
if($_SERVER['REQUEST_METHOD'] == 'POST' &&
$errors) {
Modified: branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
2015-09-16 00:21:29 UTC (rev 13929)
+++ branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
2015-09-16 00:23:53 UTC (rev 13930)
@@ -162,6 +162,9 @@
$building['buildings_link'] =
self::link(array('menuaction' => 'booking.uibuilding.index'));
$building['cancel_link'] =
self::link(array('menuaction' => 'booking.uibuilding.index'));
// $this->use_yui_editor();
+
+ $GLOBALS['phpgw']->jqcal->add_listener('start_date',
'datetime');
+ $GLOBALS['phpgw']->jqcal->add_listener('end_date',
'datetime');
$tabs = array();
$tabs['generic'] = array('label' => lang('Building
New'), 'link' => '#building_form');
Modified: branches/dev-syncromind/booking/js/booking/allocation.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/allocation.js 2015-09-16
00:21:29 UTC (rev 13929)
+++ branches/dev-syncromind/booking/js/booking/allocation.js 2015-09-16
00:23:53 UTC (rev 13930)
@@ -1,3 +1,58 @@
+
+
+
+$(document).ready(function() {
+
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uibuilding.index&phpgw_return_as=json&',
+ 'field_building_name',
'field_building_id', 'building_container');
+
+
+
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uiorganization.index&phpgw_return_as=json&',
+ 'field_org_name', 'field_org_id',
'org_container');
+});
+
+
+$(window).load(function() {
+ $("#field_building_name").on("autocompleteselect", function(event, ui){
+ var building_id = ui.item.value;
+ populateSelectSeason(building_id);
+ populateTableChkResources(building_id)
+ });
+});
+
+function populateSelectSeason (building_id) {
+ var url =
'index.php?menuaction=booking.uiseason.index&sort=name&filter_building_id=' +
building_id + '&phpgw_return_as=json&';
+ var container = $('#season_container');
+ populateSelect(url, container);
+}
+function populateTableChkResources (building_id) {
+ var url =
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' +
building_id + '&phpgw_return_as=json&'
+ var container = 'resources_container';
+ populateTableChk(url, container)
+}
+
+function populateTableChk (url, container) {
+ var colDefsResources = [{label: '', object: [{type: 'checkbox', name:
'resources[]', value: 'id'}]},{key: 'name', label: lang['Name']}, {key: 'type',
label: lang['Resource Type']}];
+ createTable(container,url,colDefsResources);
+}
+function populateSelect (url, container) {
+ container.html("");
+ var select = document.createElement('select');
+ var option = document.createElement('option');
+ container.append(select);
+ option.setAttribute('value', '');
+ option.text = '-----';
+ select.appendChild(option);
+ $.get(url, function(r){
+ $.each(r.data, function(index, value){
+ var option = document.createElement('option');
+ option.text = value.name;
+ option.setAttribute('value', value.id);
+ select.appendChild(option);
+ });
+ });
+}
+
+/*
populateSeasonTable = function(building_id, selection) {
YAHOO.booking.radioTableHelper('season_container',
'index.php?menuaction=booking.uiseason.index&sort=name&filter_building_id=' +
building_id + '&phpgw_return_as=json&',
'season_id', selection);
@@ -54,3 +109,4 @@
argument: this
});
}
+*/
\ No newline at end of file
Modified: branches/dev-syncromind/booking/templates/base/activity_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/activity_edit.xsl
2015-09-16 00:21:29 UTC (rev 13929)
+++ branches/dev-syncromind/booking/templates/base/activity_edit.xsl
2015-09-16 00:23:53 UTC (rev 13930)
@@ -48,7 +48,6 @@
<label for="field_parent_id">
<h4><xsl:value-of select="php:function('lang', 'Parent
activity')"/></h4>
</label>
- <!--div class="autocomplete"-->
<select name="parent_id" id="field_parent_id">
<option value="0"><xsl:value-of
select="php:function('lang', 'No parent')"/></option>
<xsl:for-each select="activities">
@@ -63,8 +62,6 @@
</option>
</xsl:for-each>
</select>
- <div id="parent_container"></div>
- <!--/div-->
</div>
</div>
</div>
Modified: branches/dev-syncromind/booking/templates/base/activity_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/activity_new.xsl
2015-09-16 00:21:29 UTC (rev 13929)
+++ branches/dev-syncromind/booking/templates/base/activity_new.xsl
2015-09-16 00:23:53 UTC (rev 13930)
@@ -26,21 +26,18 @@
<label for="field_parent_id">
<h4><xsl:value-of select="php:function('lang', 'Parent
activity')" /></h4>
</label>
- <!--div class="autocomplete"-->
<select name="parent_id" id="field_parent_id">
<option value="0"><xsl:value-of
select="php:function('lang', 'No Parent')" /></option>
<xsl:for-each select="activities">
<option>
- <xsl:if test="../activity/parent_id =
id">
- <xsl:attribute
name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:attribute
name="value"><xsl:value-of select="id"/></xsl:attribute>
- <xsl:value-of select="name"/>
+ <xsl:if test="../activity/parent_id = id">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="value"><xsl:value-of
select="id"/></xsl:attribute>
+ <xsl:value-of select="name"/>
</option>
</xsl:for-each>
</select>
- <div id="parent_container"/>
- <!--/div-->
</div>
</div>
</div>
Modified: branches/dev-syncromind/booking/templates/base/allocation_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation_new.xsl
2015-09-16 00:21:29 UTC (rev 13929)
+++ branches/dev-syncromind/booking/templates/base/allocation_new.xsl
2015-09-16 00:23:53 UTC (rev 13930)
@@ -147,8 +147,10 @@
</select>
</div>
<div class="pure-control-group">
- <label><h4><xsl:value-of select="php:function('lang',
'Season')" /></h4></label>
- <!--div id="season_container"--><xsl:value-of
select="php:function('lang', 'Select a building first')" /><!--/div-->
+ <label style="vertical-align:top;">
+ <h4><xsl:value-of select="php:function('lang',
'Season')" /></h4>
+ </label>
+ <div id="season_container"
style="display:inline-block;"><xsl:value-of select="php:function('lang',
'Select a building first')" /></div>
</div>
<div class="pure-control-group">
<label for="field_cost"><h4><xsl:value-of
select="php:function('lang', 'Cost')" /></h4></label>
@@ -157,8 +159,10 @@
</input>
</div>
<div class="pure-control-group">
- <label><h4><xsl:value-of select="php:function('lang',
'Resources')" /></h4></label>
- <!--div id="resources_container"--><xsl:value-of
select="php:function('lang', 'Select a building first')" /><!--/div-->
+ <label style="vertical-align:top;">
+ <h4><xsl:value-of select="php:function('lang',
'Resources')" /></h4>
+ </label>
+ <div id="resources_container"
style="display:inline-block;"><xsl:value-of select="php:function('lang',
'Select a building first')" /></div>
</div>
</div>
</div>
@@ -173,6 +177,12 @@
</div>
</form>
<!--/div-->
+
+ <script type="text/javascript">
+ var season_id = '<xsl:value-of select="allocation/season_id"/>';
+ var initialSelection = <xsl:value-of
select="allocation/resources_json"/>;
+ var lang = <xsl:value-of select="php:function('js_lang', 'Name',
'Resource Type')"/>;
+ </script>
<!--script type="text/javascript">
YAHOO.booking.season_id = '<xsl:value-of
select="allocation/season_id"/>';
YAHOO.booking.initialSelection = <xsl:value-of
select="allocation/resources_json"/>;
Modified: branches/dev-syncromind/booking/templates/base/application.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/application.xsl
2015-09-16 00:21:29 UTC (rev 13929)
+++ branches/dev-syncromind/booking/templates/base/application.xsl
2015-09-16 00:23:53 UTC (rev 13930)
@@ -502,26 +502,26 @@
]]>
- var colDefsResources = [{key: 'name', label: lang['Resources'],
formatter: genericLink()}, {key: 'type', label: lang['Resource Type']}];
+ var colDefsResources = [{key: 'name', label: lang['Resources'],
formatter: genericLink}, {key: 'type', label: lang['Resource Type']}];
if (currentuser == 1) {
var colDefsAssociated = [
- {key: 'id', label: lang['ID'], formatter:
genericLink()},
+ {key: 'id', label: lang['ID'], formatter: genericLink},
{key: 'type', label: lang['Type']},
{key: 'from_', label: lang['From']},
{key: 'to_', label: lang['To']},
{key: 'active', label: lang['Active']},
- {key: 'dellink', label: lang['Delete'], formatter:
genericLink2()}];
+ {key: 'dellink', label: lang['Delete'], formatter:
genericLink2}];
} else {
var colDefsAssociated = [
- {key: 'id', label: lang['ID'], formatter:
genericLink()},
+ {key: 'id', label: lang['ID'], formatter: genericLink},
{key: 'type', label: lang['Type']},
{key: 'from_', label: lang['From']},
{key: 'to_', label: lang['To']},
{key: 'active', label: lang['Active']}];
}
- var colDefsDocuments = [{key: 'name', label: lang['Document'],
formatter: genericLink()}];
+ var colDefsDocuments = [{key: 'name', label: lang['Document'],
formatter: genericLink}];
createTable('resources_container',resourcesURL,colDefsResources);
createTable('associated_container',associatedURL,colDefsAssociated,'results');
Modified: branches/dev-syncromind/booking/templates/base/booking.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/booking.xsl 2015-09-16
00:21:29 UTC (rev 13929)
+++ branches/dev-syncromind/booking/templates/base/booking.xsl 2015-09-16
00:23:53 UTC (rev 13930)
@@ -77,24 +77,29 @@
<![CDATA[
var resourcesURL =
'index.php?menuaction=booking.uiresource.index&sort=name&phpgw_return_as=json&'
+ resourceIds;
]]>
+ var colDefsResources = [{key: 'name', label: lang['Name'], formatter:
genericLink}, {key: 'type', label: lang['Resource Type']}];
+ createTable('resources_container',resourcesURL,colDefsResources);
+
+ /*
$.get(resourcesURL, function(resourcesData){
- var resourcesBody = '';
- var resourcesTableClass = "pure-table";
- if (resourcesData.data.length === 0){
- resourcesBody = '<tr><td colspan="2">'+lang['No records
found']+'</td></tr>';
- }else{
- resourcesTableClass = "pure-table pure-table-striped";
- $.each(resourcesData.data , function(index,value){
- <![CDATA[
- resourcesBody += '<tr><td><a
href='+value.link+'>'+value.name+'</a></td><td>'+value.type+'</td></tr>';
- ]]>
- });
- }
- <![CDATA[
- var resourcesTable = '<table
class="'+resourcesTableClass+'"><thead><tr><th>'+lang['Name']+'</th><th>'+lang['Resource
Type']+'</th></tr></thead><tbody>'+resourcesBody+'</tbody></table>';
- ]]>
- $('#resources_container').html(resourcesTable);
- });
+ var resourcesBody = '';
+ var resourcesTableClass = "pure-table";
+ if (resourcesData.data.length === 0){
+ resourcesBody = '<tr><td colspan="2">'+lang['No records
found']+'</td></tr>';
+ }else{
+ resourcesTableClass = "pure-table pure-table-striped";
+ $.each(resourcesData.data , function(index,value){
+ <![CDATA[
+ resourcesBody += '<tr><td><a
href='+value.link+'>'+value.name+'</a></td><td>'+value.type+'</td></tr>';
+ ]]>
+ });
+ }
+ <![CDATA[
+ var resourcesTable = '<table
class="'+resourcesTableClass+'"><thead><tr><th>'+lang['Name']+'</th><th>'+lang['Resource
Type']+'</th></tr></thead><tbody>'+resourcesBody+'</tbody></table>';
+ ]]>
+ $('#resources_container').html(resourcesTable);
+ });
+ */
</script>
<!--script type="text/javascript">
var resourceIds = '<xsl:value-of select="booking/resource_ids"/>';
Modified: branches/dev-syncromind/booking/templates/base/building.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/building.xsl 2015-09-16
00:21:29 UTC (rev 13929)
+++ branches/dev-syncromind/booking/templates/base/building.xsl 2015-09-16
00:23:53 UTC (rev 13930)
@@ -188,12 +188,20 @@
var lang = <xsl:value-of select="php:function('js_lang', 'Name',
'Category', 'Actions', 'Account', 'Role', 'Edit', 'Delete', 'Resource Type',
'Sort order')"/>;
<![CDATA[
- var resourceURL =
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' +
building_id + '&phpgw_return_as=json&';
- var documentURL =
'index.php?menuaction=booking.uidocument_building.index&sort=name&filter_owner_id='
+ building_id + '&phpgw_return_as=json&';
- var permissionURL =
'index.php?menuaction=booking.uipermission_building.index&sort=name&filter_object_id='
+ building_id + '&phpgw_return_as=json&';
+ var resourcesURL =
'index.php?menuaction=booking.uiresource.index&sort=name&filter_building_id=' +
building_id + '&phpgw_return_as=json&';
+ var documentsURL =
'index.php?menuaction=booking.uidocument_building.index&sort=name&filter_owner_id='
+ building_id + '&phpgw_return_as=json&';
+ var permissionsURL =
'index.php?menuaction=booking.uipermission_building.index&sort=name&filter_object_id='
+ building_id + '&phpgw_return_as=json&';
]]>
+ var colDefsResources = [{key: 'sort', label: lang['Sort order']},{key:
'name', label: lang['Name'], genericLink}, {key: 'type', label: lang['Resource
Type']}];
+ var colDefsDocuments = [{key: 'name', label: lang['Name'], formatter:
genericLink}, {key: 'category', label: lang['Category']}, {key: 'actions',
label: lang['Actions'], formatter: genericLink(lang['Edit'], lang['Delete'])}];
+ var colDefsPermissions = [{key: 'subject_name', label: lang['Account']},
{key: 'role', label: lang['Role']}, {key: 'actions', label: lang['Actions'],
formatter: genericLink(lang['Edit'], lang['Delete'])}];
-
+ createTable('resources_container',resourcesURL,colDefsResources);
+ createTable('documents_container',documentsURL,colDefsDocuments);
+ createTable('permissions_container',permissionsURL,colDefsPermissions);
+
+
+ /*
$.get(resourceURL, function(resourceData){
var resourceBody = '';
var resourceTableClass = "pure-table";
@@ -264,6 +272,7 @@
]]>
$('#permissions_container').html(permissionTable);
});
+ */
</script>
<!--script>
Modified: branches/dev-syncromind/booking/templates/base/building_form.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/building_form.xsl
2015-09-16 00:21:29 UTC (rev 13929)
+++ branches/dev-syncromind/booking/templates/base/building_form.xsl
2015-09-16 00:23:53 UTC (rev 13930)
@@ -52,8 +52,7 @@
<!--div class="autocomplete"-->
<input id="field_location_code"
name="location_code" type="hidden" value="{building/location_code}"/>
<input id="field_location_code_name"
name="location_code_name" type="text" value="{building/location_code}"/>
- <!--div id="location_code_container"/>
- </div-->
+ <div id="location_code_container"></div>
</div>
<div class="pure-control-group">
<label>
@@ -253,6 +252,13 @@
</div>
</form>
<!--/div-->
+
+ <script type="text/javascript">
+ <![CDATA[
+
JqueryPortico.autocompleteHelper('index.php?menuaction=booking.uibuilding.properties&phpgw_return_as=json&',
+ 'field_location_code_name',
'field_location_code', 'location_code_container');
+ ]]>
+ </script>
<!--script type="text/javascript">
<![CDATA[
Modified: branches/dev-syncromind/booking/templates/base/resource.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/resource.xsl 2015-09-16
00:21:29 UTC (rev 13929)
+++ branches/dev-syncromind/booking/templates/base/resource.xsl 2015-09-16
00:23:53 UTC (rev 13930)
@@ -99,11 +99,25 @@
var lang = <xsl:value-of select="php:function('js_lang', 'Name',
'Category', 'Actions', 'Edit', 'Delete', 'Account', 'Role', 'No records
found')"/>;
<![CDATA[
- var documentURL =
'index.php?menuaction=booking.uidocument_resource.index&sort=name&filter_owner_id='
+ resource_id + '&phpgw_return_as=json&';
- var permissionURL =
'index.php?menuaction=booking.uipermission_resource.index&sort=name&filter_object_id='
+ resource_id + '&phpgw_return_as=json&';
+ var documentsURL =
'index.php?menuaction=booking.uidocument_resource.index&sort=name&filter_owner_id='
+ resource_id + '&phpgw_return_as=json&';
+ var permissionsURL =
'index.php?menuaction=booking.uipermission_resource.index&sort=name&filter_object_id='
+ resource_id + '&phpgw_return_as=json&';
]]>
- $.get(documentURL, function(documentData){
+ var colDefsDocuments = [
+ {key: 'name', label: lang['Name'], formatter: genericLink},
+ {key: 'category', label: lang['Category']},
+ {key: 'actions', label: lang['Actions'], formatter:
genericLink(lang['Edit'], lang['Delete'])}
+ ];
+ var colDefsPermissions = [
+ {key: 'subject_name', label: lang['Account']},
+ {key: 'role', label: lang['Role']},
+ {key: 'actions', label: lang['Actions'], formatter:
genericLink(lang['Edit'], lang['Delete'])}
+ ];
+ createTable('documents_container',documentsURL,colDefsDocuments);
+ createTable('permissions_container',permissionsURL,colDefsPermissions);
+
+ /*
+ $.get(documentsURL, function(documentData){
var documentBody = '';
var documentTableClass = "pure-table";
<![CDATA[
@@ -126,7 +140,7 @@
});
- $.get(permissionURL, function(permissionData){
+ $.get(permissionsURL, function(permissionData){
var permissionBody = '';
var permissionTableClass = "pure-table";
<![CDATA[
@@ -149,17 +163,18 @@
});
<![CDATA[
-/*YAHOO.util.Event.addListener(window, "load", function() {
+ YAHOO.util.Event.addListener(window, "load", function() {
- var url =
'index.php?menuaction=booking.uidocument_resource.index&sort=name&filter_owner_id='
+ resource_id + '&phpgw_return_as=json&';
- var colDefs = [{key: 'name', label: lang['Name'], formatter:
YAHOO.booking.formatLink}, {key: 'category', label: lang['Category']}, {key:
'actions', label: lang['Actions'], formatter:
YAHOO.booking.formatGenericLink(lang['Edit'], lang['Delete'])}];
- YAHOO.booking.inlineTableHelper('documents_container', url, colDefs);
-
- var url =
'index.php?menuaction=booking.uipermission_resource.index&sort=name&filter_object_id='
+ resource_id + '&phpgw_return_as=json&';
- var colDefs = [{key: 'subject_name', label: lang['Account']}, {key:
'role', label: lang['Role']}, {key: 'actions', label: lang['Actions'],
formatter: YAHOO.booking.formatGenericLink(lang['Edit'], lang['Delete'])}];
- YAHOO.booking.inlineTableHelper('permissions_container', url, colDefs);
-});*/
-]]>
+ var url =
'index.php?menuaction=booking.uidocument_resource.index&sort=name&filter_owner_id='
+ resource_id + '&phpgw_return_as=json&';
+ var colDefs = [{key: 'name', label: lang['Name'], formatter:
YAHOO.booking.formatLink}, {key: 'category', label: lang['Category']}, {key:
'actions', label: lang['Actions'], formatter:
YAHOO.booking.formatGenericLink(lang['Edit'], lang['Delete'])}];
+ YAHOO.booking.inlineTableHelper('documents_container', url,
colDefs);
+
+ var url =
'index.php?menuaction=booking.uipermission_resource.index&sort=name&filter_object_id='
+ resource_id + '&phpgw_return_as=json&';
+ var colDefs = [{key: 'subject_name', label: lang['Account']},
{key: 'role', label: lang['Role']}, {key: 'actions', label: lang['Actions'],
formatter: YAHOO.booking.formatGenericLink(lang['Edit'], lang['Delete'])}];
+ YAHOO.booking.inlineTableHelper('permissions_container', url,
colDefs);
+ });
+ ]]>
+*/
</script>
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/season.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/season.xsl 2015-09-16
00:21:29 UTC (rev 13929)
+++ branches/dev-syncromind/booking/templates/base/season.xsl 2015-09-16
00:23:53 UTC (rev 13930)
@@ -95,8 +95,22 @@
<![CDATA[
var resourcesURL =
'index.php?menuaction=booking.uiresource.index&sort=name&phpgw_return_as=json&'
+ resourceIds;
- var permissionURL =
'index.php?menuaction=booking.uipermission_season.index&sort=name&filter_object_id='
+ season_id + '&phpgw_return_as=json&';
+ var permissionsURL =
'index.php?menuaction=booking.uipermission_season.index&sort=name&filter_object_id='
+ season_id + '&phpgw_return_as=json&';
]]>
+ var colDefsRespurces = [
+ {key: 'name', label: lang['Name'], formatter: genericLink},
+ {key: 'type', label: lang['Resource Type']}
+ ];
+ var colDefsPermissions = [
+ {key: 'subject_name', label: lang['Account']},
+ {key: 'role', label: lang['Role']},
+ {key: 'actions', label: lang['Actions'], formatter:
genericLink(lang['Edit'], lang['Delete'])}
+ ];
+ createTable('resources_container', resourcesURL, colDefsRespurces);
+ createTable('permissions_container', permissionsURL, colDefsPermissions);
+
+
+/*
$.get(resourcesURL, function(resourcesData){
var resourcesBody = '';
var resourcesTableClass = "pure-table";
@@ -116,7 +130,7 @@
$('#resources_container').html(resourcesTable);
});
- $.get(permissionURL, function(permissionData){
+ $.get(permissionsURL, function(permissionData){
var permissionBody = '';
var permissionTableClass = "pure-table";
<![CDATA[
@@ -137,7 +151,7 @@
]]>
$('#permissions_container').html(permissionTable);
});
-
+*/
</script>
<!--script>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13930] fixing forms,
Saul <=