install updates

Author: studsu

test_button.py

@@ -41,7 +41,13 @@ def test_button():
     else:
         print("❌ Version icon NOT found")
 
-    # Test clicking the button
+    # Check for install update button
+    if 'Install Update' in content:
+        print("✅ Install Update button found!")
+    else:
+        print("❌ Install Update button NOT found")
+    
+    # Test clicking the check updates button
     response = client.get('/admin/updates/versioncheck/?check_updates=1')
     print(f"Check updates response: {response.status_code}")
 
@@ -51,6 +57,21 @@ def test_button():
         messages = list(get_messages(response.wsgi_request))
         for message in messages:
             print(f"Message: {message}")
+    
+    # Now check if install button appears after update check
+    response = client.get('/admin/updates/versioncheck/')
+    content = response.content.decode('utf-8')
+    if 'Install Update' in content:
+        print("✅ Install Update button appeared after check!")
+        
+        # Test install button (but don't actually install)
+        print("🧪 Testing install update URL (simulation mode)")
+        if 'install_update=1' in content:
+            print("✅ Install URL parameter found!")
+        else:
+            print("❌ Install URL parameter NOT found")
+    else:
+        print("❌ Install Update button NOT found after check")
 
 if __name__ == '__main__':
     test_button()

updates/admin.py

@@ -58,8 +58,27 @@ def update_status(self, obj):
 
     def changelist_view(self, request, extra_context=None):
         """Add check updates button to the changelist"""
+        # Handle install update request
+        if request.GET.get('install_update'):
+            from .git_checker import git_checker
+            from django.contrib import messages
+            
+            # Get the latest version to install
+            latest_check = VersionCheck.objects.filter(check_successful=True, update_available=True).first()
+            if latest_check:
+                result = git_checker.install_update(latest_check.latest_version)
+                
+                if result['success']:
+                    messages.success(request, 
+                        f"🎉 Successfully updated to version {result['new_version']}! "
+                        f"Please restart the server to apply changes.")
+                else:
+                    messages.error(request, f"❌ Update failed: {result.get('error', 'Unknown error')}")
+            else:
+                messages.error(request, "❌ No available update found to install.")
+        
         # Handle check updates request
-        if request.GET.get('check_updates'):
+        elif request.GET.get('check_updates'):
             from .git_checker import git_checker
             from .models import UpdateSettings
 
@@ -104,6 +123,13 @@ def changelist_view(self, request, extra_context=None):
         current_version = git_checker.get_current_version()
         extra_context['current_version'] = current_version
 
+        # Check if update is available and add install button
+        latest_check = VersionCheck.objects.filter(check_successful=True).first()
+        if latest_check and latest_check.update_available:
+            install_url = request.path + '?install_update=1'
+            extra_context['install_update_url'] = install_url
+            extra_context['latest_version'] = latest_check.latest_version
+        
         return super().changelist_view(request, extra_context)
 
 

updates/git_checker.py

@@ -178,6 +178,92 @@ def check_for_updates(self, include_prereleases=False):
                 'latest_version': self.get_current_version(),
                 'update_available': False,
             }
+    
+    def install_update(self, target_version):
+        """Install update by pulling and checking out the specified version"""
+        try:
+            current_version = self.get_current_version()
+            
+            # Ensure we have a clean working directory
+            result = subprocess.run(
+                ['git', 'status', '--porcelain'],
+                capture_output=True,
+                text=True,
+                cwd=settings.BASE_DIR
+            )
+            
+            if result.stdout.strip():
+                return {
+                    'success': False,
+                    'error': 'Working directory is not clean. Please commit or stash changes before updating.',
+                    'current_version': current_version,
+                }
+            
+            # Fetch latest changes from remote
+            result = subprocess.run(
+                ['git', 'fetch', '--tags'],
+                capture_output=True,
+                text=True,
+                cwd=settings.BASE_DIR
+            )
+            
+            if result.returncode != 0:
+                return {
+                    'success': False,
+                    'error': f'Failed to fetch updates: {result.stderr}',
+                    'current_version': current_version,
+                }
+            
+            # Checkout the target version
+            tag_name = target_version if target_version.startswith('v') else f'v{target_version}'
+            result = subprocess.run(
+                ['git', 'checkout', tag_name],
+                capture_output=True,
+                text=True,
+                cwd=settings.BASE_DIR
+            )
+            
+            if result.returncode != 0:
+                # Try without 'v' prefix
+                result = subprocess.run(
+                    ['git', 'checkout', target_version],
+                    capture_output=True,
+                    text=True,
+                    cwd=settings.BASE_DIR
+                )
+                
+                if result.returncode != 0:
+                    return {
+                        'success': False,
+                        'error': f'Failed to checkout version {target_version}: {result.stderr}',
+                        'current_version': current_version,
+                    }
+            
+            # Update version file if it exists
+            version_file = settings.BASE_DIR / 'version.json'
+            if version_file.exists():
+                try:
+                    with open(version_file, 'w') as f:
+                        json.dump({'version': target_version}, f, indent=2)
+                except Exception as e:
+                    logger.warning(f"Could not update version file: {e}")
+            
+            new_version = self.get_current_version()
+            
+            return {
+                'success': True,
+                'message': f'Successfully updated from {current_version} to {new_version}',
+                'old_version': current_version,
+                'new_version': new_version,
+            }
+            
+        except Exception as e:
+            logger.error(f"Error installing update: {e}")
+            return {
+                'success': False,
+                'error': str(e),
+                'current_version': self.get_current_version(),
+            }
 
 
 # Global instance

updates/templates/admin/updates/versioncheck/change_list.html

@@ -6,12 +6,24 @@
     <div style="background: #f8f9fa; border: 1px solid #dee2e6; padding: 10px; margin: 10px 0; border-radius: 4px;">
         <strong>📦 Current Installed Version: </strong>
         <span style="color: #007cba; font-weight: bold; font-size: 1.1em;">{{ current_version }}</span>
+        {% if latest_version %}
+        <br><strong>🆙 Update Available: </strong>
+        <span style="color: #28a745; font-weight: bold; font-size: 1.1em;">{{ latest_version }}</span>
+        {% endif %}
     </div>
     {% endif %}
 {% endblock %}
 
 {% block object-tools-items %}
     {{ block.super }}
+    {% if install_update_url %}
+    <li>
+        <a href="{{ install_update_url }}" class="addlink" style="background: #28a745; color: white;" 
+           onclick="return confirm('Are you sure you want to install the update? This will update your CMS to version {{ latest_version }}.');">
+            🚀 Install Update to {{ latest_version }}
+        </a>
+    </li>
+    {% endif %}
     {% if check_updates_url %}
     <li>
         <a href="{{ check_updates_url }}" class="addlink" style="background: #007cba; color: white;">