From: <nk...@us...> - 2013-10-22 09:13:10
|
Revision: 48135 http://sourceforge.net/p/tikiwiki/code/48135 Author: nkoth Date: 2013-10-22 09:13:03 +0000 (Tue, 22 Oct 2013) Log Message: ----------- [ENH] Add svn update functionality to show.tiki.org and some fixes Modified Paths: -------------- branches/12.x/lib/core/Services/ShowTikiOrg/Controller.php branches/12.x/lib/core/Tracker/Field/ShowTikiOrg.php branches/12.x/templates/trackerinput/showtikiorg.tpl Modified: branches/12.x/lib/core/Services/ShowTikiOrg/Controller.php =================================================================== --- branches/12.x/lib/core/Services/ShowTikiOrg/Controller.php 2013-10-21 21:18:04 UTC (rev 48134) +++ branches/12.x/lib/core/Services/ShowTikiOrg/Controller.php 2013-10-22 09:13:03 UTC (rev 48135) @@ -55,6 +55,21 @@ $infooutput = stream_get_contents($infostream); $ret['debugoutput'] = $infooutput; + if (strpos($infooutput, 'MAINTENANCE: ') !== false) { + $maintpos = strpos($infooutput, 'MAINTENANCE: '); + $maintreason = substr($infooutput, $maintpos + 13); + $maintreason = substr($maintreason, 0, strpos($maintreason, '"')); + $ret['maintreason'] = $maintreason; + $ret['status'] = 'MAINT'; + return $ret; + } + + $versionpos = strpos($infooutput, 'VERSION: '); + $version = substr($infooutput, $versionpos + 9); + $version = substr($version, 0, strpos($version, PHP_EOL)); + $version = trim($version); + $ret['version'] = $version; + $statuspos = strpos($infooutput, 'STATUS: '); $status = substr($infooutput, $statuspos + 8, 5); $status = trim($status); @@ -82,7 +97,7 @@ } if (!empty($command)) { - if (($command == 'reset' || $command == 'destroy') && !TikiLib::lib('user')->user_has_permission($user, 'tiki_p_admin') && $user != $creator) { + if (($command == 'update' || $command == 'reset' || $command == 'destroy') && !TikiLib::lib('user')->user_has_permission($user, 'tiki_p_admin') && $user != $creator) { throw new Services_Exception_Denied; } @@ -102,7 +117,7 @@ $ret['status'] = 'SNAPS'; } else if ($command == 'destroy') { $ret['status'] = 'DESTR'; - } else if ($command == 'create') { + } else if ($command == 'create' || $command == 'update') { $ret['status'] = 'BUILD'; } else if ($command == 'reset') { if (strpos('ERROR', $fullstring) !== false) { Modified: branches/12.x/lib/core/Tracker/Field/ShowTikiOrg.php =================================================================== --- branches/12.x/lib/core/Tracker/Field/ShowTikiOrg.php 2013-10-21 21:18:04 UTC (rev 48134) +++ branches/12.x/lib/core/Tracker/Field/ShowTikiOrg.php 2013-10-22 09:13:03 UTC (rev 48135) @@ -151,6 +151,21 @@ $infooutput = stream_get_contents($infostream); $ret['debugoutput'] = $infostring . " " . $infooutput; + if (strpos($infooutput, 'MAINTENANCE: ') !== false) { + $maintpos = strpos($infooutput, 'MAINTENANCE: '); + $maintreason = substr($infooutput, $maintpos + 13); + $maintreason = substr($maintreason, 0, strpos($maintreason, '"')); + $ret['maintreason'] = $maintreason; + $ret['status'] = 'MAINT'; + return $ret; + } + + $versionpos = strpos($infooutput, 'VERSION: '); + $version = substr($infooutput, $versionpos + 9); + $version = substr($version, 0, strpos($version, PHP_EOL)); + $version = trim($version); + $ret['version'] = $version; + $statuspos = strpos($infooutput, 'STATUS: '); $status = substr($infooutput, $statuspos + 8, 5); $status = trim($status); Modified: branches/12.x/templates/trackerinput/showtikiorg.tpl =================================================================== --- branches/12.x/templates/trackerinput/showtikiorg.tpl 2013-10-21 21:18:04 UTC (rev 48134) +++ branches/12.x/templates/trackerinput/showtikiorg.tpl 2013-10-22 09:13:03 UTC (rev 48135) @@ -34,6 +34,11 @@ <p>Unable to connect to show.tiki.org. Please let us know of the problem so that we can do something about it. Thanks.</p> {/remarksbox} </div> +<div class="showmaint{$field.fieldId}_{$item.itemId}" {if $field.status neq 'MAINT'}style="display: none;"{/if}> +{remarksbox type="error" title="Show.tiki.org is under maintenance" close="n"} +<p>Show.tiki.org is currently under maintenance. Sorry for the inconvenience. {$field.maintreason|escape}</p> +{/remarksbox} +</div> <div class="showfail{$field.fieldId}_{$item.itemId}" {if $field.status neq 'FAIL'}style="display: none;"{/if}> {remarksbox type="error" title="Unable to get information from show.tiki.org" close="n"} <p>Unable to get information from show.tiki.org. Please let us know of the problem so that we can do something about it. Thanks.</p> @@ -94,6 +99,7 @@ {if $field.canDestroy} {button href="#showtikiorg{$field.fieldId}_{$item.itemId}{if isset($context.list_mode)}_view{/if}" _onclick="showtikiorg_process{$field.fieldId}_{$item.itemId}('destroy');" _text="{tr}Destroy this show.tiki.org instance{/tr}"} {button href="#showtikiorg{$field.fieldId}_{$item.itemId}{if isset($context.list_mode)}_view{/if}" _onclick="showtikiorg_process{$field.fieldId}_{$item.itemId}('reset');" _text="{tr}Reset password to 12345{/tr}"} +<span class="buttonupdate{$field.fieldId}_{$item.itemId}" {if $field.version != 'trunk' && $field.version != '12.x'}style="display: none;"{/if}>{button href="#showtikiorg{$field.fieldId}_{$item.itemId}{if isset($context.list_mode)}_view{/if}" _onclick="showtikiorg_process{$field.fieldId}_{$item.itemId}('update');" _text="{tr}SVN update{/tr}"}</span> {/if} </div> @@ -122,14 +128,26 @@ success: function(data) { var debugoutput = data.debugoutput; $('.showdebugoutput{{$field.fieldId}}_{{$item.itemId}}').html(data.debugoutput); + if (data.version == '12.x' || data.version == 'trunk') { + $('.buttonupdate{{$field.fieldId}}_{{$item.itemId}}').show(); + } if (data.status == 'DISCO') { $('.showdisconnected{{$field.fieldId}}_{{$item.itemId}}').show(); + $('.showmaint{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showfail{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showsnapshot{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showdestroy{{$field.fieldId}}_{{$item.itemId}}').hide(); $.modal(); + } else if (data.status == 'MAINT') { + $('.showmaint{{$field.fieldId}}_{{$item.itemId}}').show(); + $('.showdisconnected{{$field.fieldId}}_{{$item.itemId}}').hide(); + $('.showfail{{$field.fieldId}}_{{$item.itemId}}').hide(); + $('.showsnapshot{{$field.fieldId}}_{{$item.itemId}}').hide(); + $('.showdestroy{{$field.fieldId}}_{{$item.itemId}}').hide(); + $.modal(); } else if (data.status == 'FAIL') { $('.showfail{{$field.fieldId}}_{{$item.itemId}}').show(); + $('.showmaint{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showdisconnected{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showsnapshot{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showdestroy{{$field.fieldId}}_{{$item.itemId}}').hide(); @@ -140,6 +158,7 @@ $('.showactive{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showfail{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showdisconnected{{$field.fieldId}}_{{$item.itemId}}').hide(); + $('.showmaint{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showsnapshot{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showdestroy{{$field.fieldId}}_{{$item.itemId}}').hide(); setTimeout("showtikiorg_process{{$field.fieldId}}_{{$item.itemId}}('info')",5000); @@ -150,6 +169,7 @@ $('.showbuilding{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showfail{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showdisconnected{{$field.fieldId}}_{{$item.itemId}}').hide(); + $('.showmaint{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showsnapshot{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showdestroy{{$field.fieldId}}_{{$item.itemId}}').hide(); $.modal(); @@ -159,6 +179,7 @@ $('.shownone{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showfail{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showdisconnected{{$field.fieldId}}_{{$item.itemId}}').hide(); + $('.showmaint{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showsnapshot{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showdestroy{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showurl{{$field.fieldId}}_{{$item.itemId}}').attr("href", "http://" + data.showurl).html("http://" + data.showurl); @@ -171,6 +192,7 @@ $('.shownone{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showfail{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showdisconnected{{$field.fieldId}}_{{$item.itemId}}').hide(); + $('.showmaint{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showsnapshot{{$field.fieldId}}_{{$item.itemId}}').show(); $('.showdestroy{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showresetok{{$field.fieldId}}_{{$item.itemId}}').hide(); @@ -187,6 +209,7 @@ $('.shownone{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showfail{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showdisconnected{{$field.fieldId}}_{{$item.itemId}}').hide(); + $('.showmaint{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showsnapshot{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showresetnok{{$field.fieldId}}_{{$item.itemId}}').hide(); $('.showresetok{{$field.fieldId}}_{{$item.itemId}}').hide(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |