Commit e1afbfa4 authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1724704: The webservice connection manager 'Add' field missing 



It only shows if there are existing connection objects

So will split out the add form from the objects list

behatnotneeded

Change-Id: Iec66f2a8a9bfb744b9673ee9a797246e1a59f420
Signed-off-by: default avatarRobert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 6aa41223)
parent 9b295676

htdocs/auth/webservice/lang/en.utf8/auth.webservice.php

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ $string['youmaynotregisterwithouttandc'] = 'You may not register unless you agre 




$string['pluginconnections'] = 'Connection objects';

$string['pcdescription'] = 'Select a connection';

$string['nodefinedconnections'] = 'No webservice connections defined in any plugins. Please define a connection first.';

$string['instancelistempty'] = 'No connection objects for this institution.';



$string['addconnection'] = 'Add client connection';

htdocs/theme/raw/plugintype/auth/webservice/templates/addconnectionform.tpl

0 → 100644
+29 −0
Original line number Diff line number Diff line 
{{if $connections}}

<script type="application/javascript">



    function addinstance() {

        var selectedPlugin = document.getElementById('dummySelect').value;

        var institution = '{{$institution}}';

        window.location = '{{$WWWROOT}}webservice/admin/addconnection.php?add=1&i={{$institution}}&p=' + selectedPlugin;

        return;

    }



</script>



<div class="select connections lead">

    <span class="picker">

        <select class="select form-control" name="dummy" id="dummySelect">

        {{foreach $connections connection}}

        <option value="{{$connection->id}}">{{$connection->shortname}} - {{$connection->name}}</option>

        {{/foreach}}

        </select>

    </span>

    <div>

        <button class="btn btn-primary" type="button" onclick="addinstance(); return false;" name="button" value="foo">{{str tag=Add section=admin}}</button>

    </div>

</div>

{{else}}

<div class="alert alert-info">

{{str tag="nodefinedconnections" section="auth.webservice"}}

</div>

{{/if}}
 
 No newline at end of file

htdocs/theme/raw/plugintype/auth/webservice/templates/configform.tpl

+11 −7
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


<div class="collapsible-group" id="accordion" aria-multiselectable="true" role="tablist" >

{foreach from=$form.elements item=element name=elements}

    {if $element.type == 'fieldset'}

    <div class="pseudofieldset panel panel-default collapsible collapsible-group{if $.foreach.elements.last} last{/if}">

        <h2 class="pseudolegend panel-heading has-link">

        <a class="{if !$.foreach.elements.first}collapsed{/if}" href="#{$element.name}_pseudofieldset" data-toggle="collapse" aria-expanded="{if $.foreach.elements.first}true{else}false{/if}" aria-controls="{$element.name}_pseudofieldset" data-parent="#accordion">
@@ -10,12 +11,15 @@ 
         <span class="icon icon-chevron-down right collapse-indicator pull-right" role="presentation" aria-hidden="true"></span>

        </a>

        </h2>

    <div class="panel-body table-responsive collapse {if $.foreach.elements.first} in{/if}" id="{$element.name}_pseudofieldset">

        <div class="panel-body table-responsive collapse {if $.foreach.elements.first} in{/if}{if $.foreach.elements.last} no-footer{/if}" id="{$element.name}_pseudofieldset">

        {foreach from=$element.elements item=item}

            {$item.value|safe}

        {/foreach}

        </div>

    </div>

    {else}

        {$element.value|safe}

    {/if}

{/foreach}

</div>

<script type="application/javascript">

htdocs/theme/raw/plugintype/auth/webservice/templates/connections.tpl

+0 −20
Original line number Diff line number Diff line
@@ -104,13 +104,6 @@ 
        return false;

    }



    function addinstance() {

        var selectedPlugin = document.getElementById('dummySelect').value;

        var institution = '{{$institution}}';

        window.location = '{{$WWWROOT}}webservice/admin/addconnection.php?add=1&i={{$institution}}&p=' + selectedPlugin;

        return;

    }



    function editinstance(id, plugin) {

        window.location = '{{$WWWROOT}}webservice/admin/addconnection.php?id=' + id + '&edit=1&i={{$institution}}&p=' + plugin;

        return;
@@ -160,19 +153,6 @@ IMPORTANT: do not introduce any new whitespace into the instanceList div. 
    </div>

    {{/foreach}}

</div>

<div class="postlist">{{str tag='pcdescription' section='auth.webservice'}}</div>

<div class="select connections">

    <span class="picker">

        <select class="select form-control" name="dummy" id="dummySelect">

        {{foreach $connections connection}}

            <option value="{{$connection->id}}">{{$connection->shortname}} - {{$connection->name}}</option>

        {{/foreach}}

        </select>

    </span>

    <div>

        <button class="btn btn-primary" type="button" onclick="addinstance(); return false;" name="button" value="foo">{{str tag=Add section=admin}}</button>

    </div>

</div>

{{else}}

<div>{{str tag='instancelistempty' section='auth.webservice'}}</div>

{{/if}}

htdocs/theme/raw_old/plugintype/auth/webservice/templates/addconnectionform.tpl

0 → 100644
+29 −0
Original line number Diff line number Diff line 
{{if $connections}}

<script type="application/javascript">



    function addinstance() {

        var selectedPlugin = document.getElementById('dummySelect').value;

        var institution = '{{$institution}}';

        window.location = '{{$WWWROOT}}webservice/admin/addconnection.php?add=1&i={{$institution}}&p=' + selectedPlugin;

        return;

    }



</script>



<div class="select connections lead">

    <span class="picker">

        <select class="select form-control" name="dummy" id="dummySelect">

        {{foreach $connections connection}}

        <option value="{{$connection->id}}">{{$connection->shortname}} - {{$connection->name}}</option>

        {{/foreach}}

        </select>

    </span>

    <div>

        <button class="btn btn-primary" type="button" onclick="addinstance(); return false;" name="button" value="foo">{{str tag=Add section=admin}}</button>

    </div>

</div>

{{else}}

<div class="alert alert-info">

{{str tag="nodefinedconnections" section="auth.webservice"}}

</div>

{{/if}}
 
 No newline at end of file