From 7f13e8a5c5765483ae36d895887bc558b269f3bf Mon Sep 17 00:00:00 2001
From: Bob Trahan <btrahan@phacility.com>
Date: Wed, 7 May 2014 09:38:29 -0700
Subject: [PATCH] Workboards - remove 7 column restriction

Summary: Fixes T4914. We currently have a finite limit on column displays which caused T4914. This fixes T4914 by no longer using a fluid layout. Rather, we use a fixed column width layout which does not have a 7 column limit. Future work - see T4054 for an example - will likely make the fluid layout thing work with infinite columns, and / or other work may re-jigger project workboards directly.

Test Plan: had a project like in T4914 that wouldn't load and it loaded post this change! added more columns and using javascript inspector noted proper width being set

Reviewers: epriestley, chad

Reviewed By: epriestley

Subscribers: joshuaspence, epriestley, Korvin

Maniphest Tasks: T4054, T4914

Differential Revision: https://secure.phabricator.com/D8942
---
 resources/celerity/map.php                                | 8 ++++----
 .../controller/PhabricatorProjectBoardViewController.php  | 1 -
 src/view/layout/AphrontMultiColumnView.php                | 7 +++++--
 webroot/rsrc/css/aphront/multi-column.css                 | 2 +-
 webroot/rsrc/css/phui/phui-workpanel-view.css             | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index eaee808531..552a74ae74 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -24,7 +24,7 @@ return array(
     'rsrc/css/aphront/error-view.css' => '9f1d5518',
     'rsrc/css/aphront/lightbox-attachment.css' => '7acac05d',
     'rsrc/css/aphront/list-filter-view.css' => '2ae43867',
-    'rsrc/css/aphront/multi-column.css' => '12f65921',
+    'rsrc/css/aphront/multi-column.css' => '667ca7b8',
     'rsrc/css/aphront/notification.css' => 'ef2c9b34',
     'rsrc/css/aphront/pager-view.css' => '2e3539af',
     'rsrc/css/aphront/panel-view.css' => '5846dfa2',
@@ -147,7 +147,7 @@ return array(
     'rsrc/css/phui/phui-text.css' => '23e9b4b7',
     'rsrc/css/phui/phui-timeline-view.css' => '15ff2a9f',
     'rsrc/css/phui/phui-workboard-view.css' => '84f2c272',
-    'rsrc/css/phui/phui-workpanel-view.css' => '97b69459',
+    'rsrc/css/phui/phui-workpanel-view.css' => 'b6ccc22d',
     'rsrc/css/sprite-actions.css' => '969ad0e5',
     'rsrc/css/sprite-apps-large.css' => '3e3ec4c3',
     'rsrc/css/sprite-apps-xlarge.css' => 'db66c878',
@@ -495,7 +495,7 @@ return array(
     'aphront-dialog-view-css' => 'c01d24b4',
     'aphront-error-view-css' => '9f1d5518',
     'aphront-list-filter-view-css' => '2ae43867',
-    'aphront-multi-column-view-css' => '12f65921',
+    'aphront-multi-column-view-css' => '667ca7b8',
     'aphront-pager-view-css' => '2e3539af',
     'aphront-panel-view-css' => '5846dfa2',
     'aphront-request-failure-view-css' => 'da14df31',
@@ -776,7 +776,7 @@ return array(
     'phui-text-css' => '23e9b4b7',
     'phui-timeline-view-css' => '15ff2a9f',
     'phui-workboard-view-css' => '84f2c272',
-    'phui-workpanel-view-css' => '97b69459',
+    'phui-workpanel-view-css' => 'b6ccc22d',
     'phuix-action-list-view' => 'b5c256b8',
     'phuix-action-view' => '19a0b148',
     'phuix-dropdown-menu' => 'bd4c8dca',
diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
index a6976197c7..2cf8b8ead8 100644
--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
@@ -89,7 +89,6 @@ final class PhabricatorProjectBoardViewController
 
     $board = id(new PHUIWorkboardView())
       ->setUser($viewer)
-      ->setFluidishLayout(true)
       ->setID($board_id);
 
     $this->initBehavior(
diff --git a/src/view/layout/AphrontMultiColumnView.php b/src/view/layout/AphrontMultiColumnView.php
index e314cb2a6b..b1b6b90760 100644
--- a/src/view/layout/AphrontMultiColumnView.php
+++ b/src/view/layout/AphrontMultiColumnView.php
@@ -45,8 +45,11 @@ final class AphrontMultiColumnView extends AphrontView {
     $classes[] = 'aphront-multi-column-inner';
     $classes[] = 'grouped';
 
-    if (count($this->columns) > 7) {
-      throw new Exception("No more than 7 columns per view.");
+    if ($this->fluidishLayout || $this->fluidLayout) {
+      // we only support seven columns for now for fluid views; see T4054
+      if (count($this->columns) > 7) {
+        throw new Exception("No more than 7 columns per view.");
+      }
     }
 
     $classes[] = 'aphront-multi-column-'.count($this->columns).'-up';
diff --git a/webroot/rsrc/css/aphront/multi-column.css b/webroot/rsrc/css/aphront/multi-column.css
index 6fe0e6f344..2005487d65 100644
--- a/webroot/rsrc/css/aphront/multi-column.css
+++ b/webroot/rsrc/css/aphront/multi-column.css
@@ -28,7 +28,7 @@
 }
 
 .aphront-multi-column-fixed .aphront-multi-column-column-outer {
-  width: 300px;
+  width: 280px;
 }
 
 /* flexible, but with a minimum */
diff --git a/webroot/rsrc/css/phui/phui-workpanel-view.css b/webroot/rsrc/css/phui/phui-workpanel-view.css
index f1ef1bc547..24b4ab2bf7 100644
--- a/webroot/rsrc/css/phui/phui-workpanel-view.css
+++ b/webroot/rsrc/css/phui/phui-workpanel-view.css
@@ -53,7 +53,7 @@
 }
 
 .aphront-multi-column-fixed .phui-workpanel-body {
-  width: 300px;
+  width: 280px;
 }
 
 .phui-workpanel-body .phui-object-item-list-view {