[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9220] Merge 9218:9219 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9220] Merge 9218:9219 from trunk |
|
Date: |
Tue, 24 Apr 2012 13:30:29 +0000 |
Revision: 9220
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9220
Author: sigurdne
Date: 2012-04-24 13:29:46 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
Merge 9218:9219 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php
branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php
branches/Version-1_0-branch/property/js/yahoo/uis_agreement.edit.js
branches/Version-1_0-branch/property/templates/base/s_agreement.xsl
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219
Modified: branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php
2012-04-24 13:21:31 UTC (rev 9219)
+++ branches/Version-1_0-branch/property/inc/class.sos_agreement.inc.php
2012-04-24 13:29:46 UTC (rev 9220)
@@ -361,7 +361,7 @@
if ($member_id > 0 && !$detail)
{
- $filtermethod .= " $where
$entity_table.member_of $this->like '%,$member_id,%' ";
+ $filtermethod .= " $where fm_vendor.member_of
{$this->like} '%,$member_id,%' ";
$where= 'AND';
}
Modified: branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php
2012-04-24 13:21:31 UTC (rev 9219)
+++ branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php
2012-04-24 13:29:46 UTC (rev 9220)
@@ -32,6 +32,7 @@
* @package property
*/
+ phpgw::import_class('phpgwapi.jquery');
phpgw::import_class('phpgwapi.yui');
class property_uis_agreement
@@ -46,16 +47,17 @@
var $public_functions = array
(
- 'index' => true,
- 'view' => true,
- 'edit' => true,
- 'delete' => true,
- 'columns' => true,
- 'edit_item' => true,
- 'view_item' => true,
- 'view_file' => true,
- 'download' => true,
- 'import' => true
+ 'index' => true,
+ 'view' => true,
+ 'edit' => true,
+ 'delete' => true,
+ 'columns' => true,
+ 'edit_item' => true,
+ 'view_item' => true,
+ 'view_file' => true,
+ 'download' => true,
+ 'import' => true,
+ 'get_vendor_member_info'=> true
);
function property_uis_agreement()
@@ -776,6 +778,7 @@
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uis_agreement.view', 'id'=> $id));
}
+ phpgwapi_jquery::load_widget('core');
$values = phpgw::get_var('values');
$delete_item = phpgw::get_var('delete_item');
$item_id = phpgw::get_var('item_id');
@@ -1045,19 +1048,13 @@
if($values['vendor_id'])
{
-
- $generic =
CreateObject('property.bogeneric');
- $generic->get_location_info('vendor');
- $vendor = $generic->read_single(array('id' =>
$values['vendor_id']));
- $member_of = explode(',',
trim($vendor['member_of'],','));
+ $member_of_list =
$this->get_vendor_member_info($values['vendor_id']);
}
else
{
- $member_of = array();
+ $member_of_list = array();
}
- $member_of_data =
$this->cats->formatted_xslt_list(array('selected' => $member_of,'globals' =>
true));
-
$table_add[] = array
(
'lang_add'
=> lang('add detail'),
@@ -1544,9 +1541,7 @@
'select_name'
=> 'values[cat_id]',
'cat_list'
=>
$this->bocommon->select_category_list(array('format'=>'select','selected' =>
$this->cat_id,'type' =>'s_agreement','order'=>'descr')),
- 'lang_member_of'
=> lang('member of'),
- 'member_of_name'
=> 'member_id',
- 'member_of_list2'
=> $member_of_data['cat_list'],
+ 'member_of_list2'
=> $member_of_list,
'attributes_group'
=> $attributes,
'lookup_functions'
=> $values['lookup_functions'],
@@ -1626,6 +1621,22 @@
$GLOBALS['phpgw']->js->validate_file( 'yahoo',
'uis_agreement.edit', 'property' );
}
+
+ function get_vendor_member_info($vendor_id = 0)
+ {
+ if(!$vendor_id)
+ {
+ $vendor_id = phpgw::get_var('vendor_id',
'int');
+ }
+ $generic = CreateObject('property.bogeneric');
+ $generic->get_location_info('vendor');
+ $vendor = $generic->read_single(array('id' =>
$vendor_id));
+ $member_of = explode(',',
trim($vendor['member_of'],','));
+ $member_of_data =
$this->cats->formatted_xslt_list(array('selected' => $member_of,'globals' =>
true));
+ return isset($member_of_data['cat_list']) &&
$member_of_data['cat_list'] ? $member_of_data['cat_list'] : array();
+ }
+
+
function download()
{
if(!$this->acl_read)
Modified: branches/Version-1_0-branch/property/js/yahoo/uis_agreement.edit.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/uis_agreement.edit.js
2012-04-24 13:21:31 UTC (rev 9219)
+++ branches/Version-1_0-branch/property/js/yahoo/uis_agreement.edit.js
2012-04-24 13:29:46 UTC (rev 9220)
@@ -239,3 +239,82 @@
});
+ this.onDOMAttrModified = function(e)
+ {
+ var attr = e.attrName || e.propertyName
+ var target = e.target || e.srcElement;
+ if (attr.toLowerCase() == 'vendor_id')
+ {
+ update_member_info();
+ }
+ }
+
+
+ this.update_member_info=function()
+ {
+ var vendor_id = $("#vendor_id").val();
+ if(!vendor_id)
+ {
+ return;
+ }
+ var oArgs =
{menuaction:'property.uis_agreement.get_vendor_member_info'};
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+
+ var htmlString = "";
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl + "&vendor_id=" + vendor_id,
+ success: function(data) {
+ if( data != null)
+ {
+ if(data.sessionExpired)
+ {
+ alert('Sesjonen er utløpt - du
må logge inn på nytt');
+ return;
+ }
+
+ var checked = "";
+ var obj = data;
+
+ $.each(obj, function(i) {
+
+ if(obj[i].selected != '')
+ {
+ checked =
"checked=\"checked\"";
+ }
+ htmlString += "<input
type=\"checkbox\" " + checked + "name=\"values[member_of][]\" value=\"" +
obj[i].cat_id + "\"></input>";
+ htmlString += obj[i].name;
+ htmlString += "<br/>";
+ checked = "";
+ });
+
+ $("#member_of").html( htmlString );
+ }
+ else
+ {
+ $("#member_of").html( htmlString );
+ }
+ }
+ });
+ $("#member_of").html( htmlString );
+ }
+
+YAHOO.util.Event.addListener(window, "load", function()
+{
+ d = document.getElementById('vendor_id');
+ if(d)
+ {
+ if (d.attachEvent)
+ {
+ d.attachEvent('onpropertychange', onDOMAttrModified,
false);
+ }
+ else
+ {
+ d.addEventListener('DOMAttrModified',
onDOMAttrModified, false);
+ }
+ }
+});
+
+
Modified: branches/Version-1_0-branch/property/templates/base/s_agreement.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/s_agreement.xsl
2012-04-24 13:21:31 UTC (rev 9219)
+++ branches/Version-1_0-branch/property/templates/base/s_agreement.xsl
2012-04-24 13:29:46 UTC (rev 9220)
@@ -287,11 +287,9 @@
<xsl:value-of select="lang_descr"/>
</td>
<td>
-
<textarea cols="60" rows="6" name="values[descr]"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+
<textarea cols="60" rows="6" name="values[descr]">
+
<xsl:attribute name="title">
<xsl:value-of select="lang_descr_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
<xsl:value-of select="value_descr"/>
</textarea>
@@ -306,6 +304,20 @@
</td>
</tr>
<xsl:call-template
name="vendor_form"/>
+ <xsl:choose>
+ <xsl:when
test="member_of_list2 != ''">
+ <tr>
+
<td valign="top">
+
<xsl:value-of select="php:function('lang', 'member of')"/>
+
</td>
+
<td valign="top">
+
<div id="member_of">
+
<xsl:apply-templates select="member_of_list2"/>
+
</div>
+
</td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
<tr>
<td
valign="top">
<xsl:value-of select="lang_budget"/>
@@ -376,22 +388,6 @@
</input>
</td>
</tr>
- <xsl:choose>
- <xsl:when
test="member_of_list2 != ''">
- <tr>
-
<div id="member_of">
-
<td valign="top">
-
<xsl:value-of select="php:function('lang', 'member of')"/>
-
</td>
-
<td valign="top">
-
<p style="height: 80px; overflow: auto; border: 5px solid #eee;
background: #eee; color: #000; margin-bottom: 1.5em;">
-
<xsl:apply-templates select="member_of_list2"/>
-
</p>
-
</td>
-
</div>
- </tr>
- </xsl:when>
- </xsl:choose>
<tr>
<td width="19%"
align="left" valign="top">
<xsl:value-of select="lang_budget"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9220] Merge 9218:9219 from trunk,
Sigurd Nes <=