oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge problem

Browse source
This commit is contained in:
Colin Kuskie 2010-04-06 14:48:04 -07:00
parent f06ce2e0eb
commit e724275663
1 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/WebGUI/Asset/Shortcut.pm
View file

@ -116,15 +116,7 @@ sub _drawQueryBuilder {
</td>
<td class="qbtd"></td>
<td class="qbtdright">
<<<<<<< HEAD:lib/WebGUI/Asset/Shortcut.pm
<<<<<<< HEAD:lib/WebGUI/Asset/Shortcut.pm
<input class="qbButton" type=button value=Add onclick="addCriteria('$fieldLabel', this.form.$opFieldName, this.form.$valFieldName)"></td>
=======
<input class="qbButton" type=button value=$addLabel onclick="addCriteria('$fieldLabel', this.form.$opFieldName, this.form.$valFieldName)" $disabled></td>
>>>>>>> f32f209... Fix shortcut hoverhelp, javascript, and criteria builder usability. Fixes bug #11516:lib/WebGUI/Asset/Shortcut.pm
=======
<input class="qbButton" type=button value=$addLabel onclick="addCriteria('$fieldLabel', this.form.$opFieldName, this.form.$valFieldName)"></td>
>>>>>>> 08b662b... Internationalize the Add button in the Criteria builder for the Shortcut.:lib/WebGUI/Asset/Shortcut.pm
</tr>
|;
$i++;